From 9996064f1337bbe4eade01716f28ec77d1cb663d Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Mon, 11 Apr 2011 14:24:37 +0000 Subject: [PATCH] In order to compile on sl5 64 bits : we need to suppress libboost_python from Boost_LIBRARIES ! (I don't get why it perfectly works on sl5 32 bits and mac osx) --- vlsisapd/src/bookshelf/src/CMakeLists.txt | 5 ++++- vlsisapd/src/configuration/src/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vlsisapd/src/bookshelf/src/CMakeLists.txt b/vlsisapd/src/bookshelf/src/CMakeLists.txt index eb8ea1ac..70bcccf8 100644 --- a/vlsisapd/src/bookshelf/src/CMakeLists.txt +++ b/vlsisapd/src/bookshelf/src/CMakeLists.txt @@ -1,4 +1,7 @@ + # to work on sl5 64 bits : need to suppress boost_python in Boost_LIBRARIES + set(Boost_LIBRARIES "") + setup_boost(program_options filesystem regex) include_directories ( ${VLSISAPD_SOURCE_DIR}/src/bookshelf/src ${Boost_INCLUDE_DIRS} @@ -25,7 +28,7 @@ target_link_libraries ( bookshelf ${Boost_LIBRARIES} ) set_target_properties ( bookshelf PROPERTIES VERSION 1.0 SOVERSION 1 ) add_executable ( bookshelf-tk ${testcpps} ) - target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ) + target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ) install ( TARGETS bookshelf DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS bookshelf-tk DESTINATION bin ) diff --git a/vlsisapd/src/configuration/src/CMakeLists.txt b/vlsisapd/src/configuration/src/CMakeLists.txt index 856f9bca..021ead89 100644 --- a/vlsisapd/src/configuration/src/CMakeLists.txt +++ b/vlsisapd/src/configuration/src/CMakeLists.txt @@ -1,4 +1,7 @@ + # to work on sl5 64 bits : need to suppress boost_python in Boost_LIBRARIES + set(Boost_LIBRARIES "") + setup_boost(program_options filesystem regex) include ( ${QT_USE_FILE} ) include_directories ( ${VLSISAPD_SOURCE_DIR}/src/configuration/src