From: davila Date: Sat, 8 Feb 2014 08:58:26 +0000 (+0100) Subject: 2299 crea Bug New Urgent Conflict with Boost (-mt not found) in fedora 20 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=crea.git;a=commitdiff_plain;h=7705f07665b1e638f5b24369c52f5936bb115ddb 2299 crea Bug New Urgent Conflict with Boost (-mt not found) in fedora 20 --- diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 49ff5bf..a80df29 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -311,7 +311,7 @@ IF(USE_BOOST) IF(NOT Boost_FOUND) add_definitions( -DBOOST_ALL_NO_LIB ) add_definitions( -DBOOST_ALL_DYN_LINK ) - FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time regex REQUIRED) + FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time thread regex program_options REQUIRED) IF(Boost_FOUND) ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=3) MESSAGE ( STATUS "=======================================") @@ -348,9 +348,10 @@ IF(USE_BOOST) SET(BOOST_LIBRARIES ${Boost_LIBRARIES} - boost_system-mt - boost_thread-mt - boost_program_options-mt +#EED 10 Fev 2014 +#EED boost_system-mt +#EED boost_thread-mt +#EED boost_program_options-mt #EED 03 mars 2011 #EED boost_signals-mt