From b84e0e47c4d3b6370d31d455a04d49c4c535204f Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 12 Jul 2010 15:14:23 +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. --- ispd/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index a3c30395..c0da77a6 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -67,6 +67,13 @@ FIND_PACKAGE(LEFDEF REQUIRED) #FIND_PACKAGE(SOLSTICE REQUIRED) SET_LIB_LINK_MODE() -FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem REQUIRED) +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)