]> Creatis software - crea.git/commitdiff
use boost_thread
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 3 Jul 2009 09:08:53 +0000 (09:08 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 3 Jul 2009 09:08:53 +0000 (09:08 +0000)
appli/creaNewProject/CMakeLists.txt
cmake/CREAMacro_FindAndUseLibraries.cmake

index ba51ff1e711e9a1d34d816530796c9b03c343dfb..153ba4bd4d77727ddcd33993ccd6b9ce905fd9be 100644 (file)
@@ -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 )
index 1647eb09f4f6b96a272ff06b311770c3d5c7923f..bd7cfb49d8e701a896a0534a238706cb3d6a8c1d 100644 (file)
@@ -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)