From: jean-pierre roux Date: Fri, 3 Jul 2009 09:08:53 +0000 (+0000) Subject: use boost_thread X-Git-Tag: EED.02Oct2009~15 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=69bbe1bf84abfab7e42a0637924b76bc7433a8e2;p=crea.git use boost_thread --- diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index ba51ff1..153ba4b 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -32,11 +32,11 @@ IF(WIN32) @ONLY IMMEDIATE ) -# CONFIGURE_FILE( -# ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in -# ${EXECUTABLE_OUTPUT_PATH}/lib/template_lib/${PROJECT_NAME}System.h -# @ONLY IMMEDIATE -# ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/NewProject/lib/template_lib/creaSystem.h.in + ${EXECUTABLE_OUTPUT_PATH}/lib/template_lib/${PROJECT_NAME}System.h + @ONLY IMMEDIATE + ) CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data) CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/Debug/creaNewProject_data ) diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake index 1647eb0..bd7cfb4 100644 --- a/cmake/CREAMacro_FindAndUseLibraries.cmake +++ b/cmake/CREAMacro_FindAndUseLibraries.cmake @@ -266,16 +266,17 @@ IF(USE_BOOST) MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}") INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS} ) - CREA_DEFINE( USE_BOOST ) IF(WIN32) LINK_DIRECTORIES( ${Boost_INCLUDE_DIRS}/lib) #MESSAGE ("EED " ${Boost_LIBRARY_DIRS}) SET(BOOST_LIBRARIES - libboost_signals-vc71-mt-1_37 - libboost_filesystem-vc71-mt-1_37 - boost_date_time-vc71-mt-1_37 + libboost_signals-vc71-mt-1_37 + libboost_filesystem-vc71-mt-1_37 + boost_date_time-vc71-mt-1_37 + + #what about boost_thread? JPR ) ENDIF(WIN32) IF(NOT WIN32) @@ -286,6 +287,7 @@ IF(USE_BOOST) boost_date_time boost_program_options boost_regex + boost_thread ) ELSE(NOT APPLE) SET(BOOST_LIBRARIES @@ -295,6 +297,7 @@ IF(USE_BOOST) boost_system-mt boost_program_options-mt boost_regex-mt + boost_thread-mt ) ENDIF(NOT APPLE) ENDIF(NOT WIN32)