From 59bab1e6033f731ccc5507b1cd849b87c3fe2a91 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 12 Jul 2010 15:18:58 +0000 Subject: [PATCH] * All tools: - Bug: target_link_libraries() must be put back for OSX Snow Leopard (doesn't seems to affect Leopard). As I do not have an OSX under my hand it's untested and is likely to fail at that point. --- metis/CMakeLists.txt | 8 ++++++++ metis/src/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/metis/CMakeLists.txt b/metis/CMakeLists.txt index 1cdb4812..04ddfbf7 100644 --- a/metis/CMakeLists.txt +++ b/metis/CMakeLists.txt @@ -58,6 +58,14 @@ FIND_LIBRARY(HMETIS_LIBRARY_PATH SET_LIBRARIES_PATH(HMETIS HMETIS) SET_LIB_LINK_MODE() +SET(Boost_USE_STATIC_LIBS ON) +MESSAGE(STATUS "Always uses Boost static libraries.") +FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python) +IF(NOT Boost_FOUND) + FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED) +ENDIF(NOT Boost_FOUND) +MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}") +MESSAGE(STATUS " ${Boost_LIBRARIES}") ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(cmake_modules) diff --git a/metis/src/CMakeLists.txt b/metis/src/CMakeLists.txt index eb99a77d..30f18b6c 100644 --- a/metis/src/CMakeLists.txt +++ b/metis/src/CMakeLists.txt @@ -21,5 +21,19 @@ endif ( HMETIS_FOUND ) ) add_library ( metis ${cpps} ${mocCpps} ) + target_link_libraries ( metis ${NIMBUS_LIBRARIES} + ${HURRICANE_PYTHON_LIBRARIES} + ${HURRICANE_GRAPHICAL_LIBRARIES} + ${HURRICANE_LIBRARIES} + ${CONFIGURATION_LIBRARY} + ${CIF_LIBRARY} + ${AGDS_LIBRARY} + ${LEFDEF_LIBRARIES} + ${OA_LIBRARIES} + ${QT_LIBRARIES} + ${Boost_LIBRARIES} + ${LIBXML2_LIBRARIES} + ${PYTHON_LIBRARIES} -lutil + ) install ( TARGETS metis DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} ${mocIncludes} DESTINATION include/coriolis2/metis )