#3204 crea Feature New Normal branch mingw64

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 3e30536fe57b55599943ec8a7a50893578c96d62..52919c30b4c978cc78ceddf5ea20d15023fcfe86 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -48,9 +48,8 @@ ENDIF(USE_QT4)
 
 
 #JFGA Pruebas WT
-
-MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
-SET(USE_WT OFF)
+#MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
+#SET(USE_WT OFF)
 
 
 #-----------------------------------------------------------------------------
@@ -266,9 +265,13 @@ ENDIF(USE_WT)
 #-----------------------------------------------------------------------------
 IF(USE_WXWIDGETS)
   IF(NOT wxWidgets_FOUND)
+       
     INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWxWidgets.cmake)
     CREA_FIND_WXWIDGETS(${USE_DEBUG_LIB})
     CREA_USE_WXWIDGETS()
+       
+               
+ 
   ENDIF(NOT wxWidgets_FOUND)
 ENDIF(USE_WXWIDGETS)
 #-----------------------------------------------------------------------------
@@ -324,9 +327,15 @@ 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 thread regex program_options REQUIRED)
+       IF (MINGW)
+               FIND_PACKAGE(Boost COMPONENTS filesystem-mgw71 system-mgw71 signals-mgw71 date_time-mgw71 thread-mgw71 regex-mgw71 program_options-mgw71 REQUIRED)
+       ELSE (MINGW)
+               FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time thread regex program_options REQUIRED)
+       ENDIF(MINGW)
     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})