#3081 crea Feature New Normal - cmake boost configuration for CentOS 2.6

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index a80df2960eb90dac7cc74696da3d9c57871ddb5f..5625e8bf86ea66fdb0874d93632dddc1a03534e4 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -26,6 +26,7 @@ ENDIF(USE_CREA)
 
 
 #-----------------------------------------------------------------------------
+
 IF(USE_QT4)
   IF(NOT QT_FOUND)     
   
@@ -40,13 +41,17 @@ IF(USE_QT4)
       INCLUDE(${QT_USE_FILE})
         
       CREA_DEFINE( USE_QT )
-    #    SET(QT_LIBRARIES
-    #         ${QT_LIBRARIES}
-    #      ) 
-    #  MARK_AS_ADVANCED(Qt4_DIR)
+
    ENDIF(QT_FOUND)
   ENDIF(NOT QT_FOUND)
 ENDIF(USE_QT4)
+
+
+#JFGA Pruebas WT
+#MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
+#SET(USE_WT OFF)
+
+
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -250,6 +255,13 @@ ENDIF(USE_GDCM2)
 
 #-----------------------------------------------------------------------------
 
+#-------------------- JFGA ---
+IF(USE_WT)
+       MESSAGE (  "======================================= JFGA ------------USE WT CREAMacro_FindAndUseLibraries.cmake")
+       INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWt.cmake)
+       CREA_FINDANDUSEWT()
+ENDIF(USE_WT)
+
 #-----------------------------------------------------------------------------
 IF(USE_WXWIDGETS)
   IF(NOT wxWidgets_FOUND)
@@ -314,6 +326,8 @@ IF(USE_BOOST)
     FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time thread regex program_options REQUIRED)
     IF(Boost_FOUND) 
          ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=3)
+         ADD_DEFINITIONS(-DBOOST_MAYOR_VERSION=${Boost_MAJOR_VERSION})
+         ADD_DEFINITIONS(-DBOOST_MINOR_VERSION=${Boost_MINOR_VERSION})
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for boost C++ library... - found in ${Boost_INCLUDE_DIR}")
       INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})