From e69ba3bd4b8e07e841b92741a0e7fd5b3236e924 Mon Sep 17 00:00:00 2001 From: Damien Dupuis Date: Thu, 15 Jul 2010 11:46:40 +0000 Subject: [PATCH] Minor correction to compile under mac osx --- crlcore/src/ccore/CMakeLists.txt | 1 + crlcore/src/ccore/Utilities.cpp | 2 +- crlcore/src/pyCRL/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index ec4e558b..e4018f05 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -28,6 +28,7 @@ ${CIF_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} + ${Boost_INCLUDE_DIRS} ) add_definitions ( -DCORIOLIS_TOP="${CORIOLIS_TOP}" diff --git a/crlcore/src/ccore/Utilities.cpp b/crlcore/src/ccore/Utilities.cpp index 4606089b..a547f508 100644 --- a/crlcore/src/ccore/Utilities.cpp +++ b/crlcore/src/ccore/Utilities.cpp @@ -34,7 +34,7 @@ namespace boptions = boost::program_options; #include "vlsisapd/configuration/Configuration.h" #include "hurricane/Warning.h" -#include "hurricane/isobar/Script.h" +#include "hurricane/viewer/Script.h" #include "crlcore/Utilities.h" diff --git a/crlcore/src/pyCRL/CMakeLists.txt b/crlcore/src/pyCRL/CMakeLists.txt index 2b7a27fa..d5842ef9 100644 --- a/crlcore/src/pyCRL/CMakeLists.txt +++ b/crlcore/src/pyCRL/CMakeLists.txt @@ -43,6 +43,7 @@ ${PYTHON_LIBRARIES} -lutil ) add_library ( CRL MODULE ${sources} ) + target_link_libraries ( CRL pycrlcore ) set_target_properties ( CRL PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" )