X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseLibraries.cmake;h=c9428581bdbd38a6998f9c82d6c490001959ae4e;hb=fdf9dec759b0aacd36194286d2816e9feafd72ad;hp=d60b46335c289a02b948c1ab750045fb928a3336;hpb=2b382add493e46bee7f6a7552ae54a4b08ab2f25;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index d60b463..c942858 100644
--- 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 ON)
+#MESSAGE (  "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")   
+#SET(USE_WT OFF)
 
 
 #-----------------------------------------------------------------------------
@@ -97,6 +96,7 @@ ENDIF(USE_KWWIDGETS)
 #
 
 #-----------------------------------------------------------------------------
+
 IF(USE_ITK)
   IF(NOT ITK_FOUND)
     # Search ITK
@@ -111,14 +111,11 @@ IF(USE_ITK)
       INCLUDE(${ITK_USE_FILE})
       CREA_DEFINE( USE_ITK )
       CREA_DEFINE( _USE_ITK_ )
-	  If (${ITK_VERSION_MAJOR} MATCHES "4")
-	   MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
-		SET(ITK_LIBRARIES
-		${ITK_LIBRARIES}) 
-		 MESSAGE ( STATUS "${ITK_LIBRARIES}")
+	  	If (${ITK_VERSION_MAJOR} MATCHES "4"  OR  ${ITK_VERSION_MAJOR} MATCHES "5"  )
+	   		MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
+			SET(ITK_LIBRARIES ${ITK_LIBRARIES}) 
 		ELSEIF()
-		SET(ITK_LIBRARIES
-			ITKCommon ITKIO ITKBasicFilters ITKAlgorithms)
+			SET(ITK_LIBRARIES ITKCommon ITKIO ITKBasicFilters ITKAlgorithms)
 		ENDIF()
       MARK_AS_ADVANCED(ITK_DIR)
     ELSE(ITK_FOUND)
@@ -266,9 +263,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 +325,18 @@ 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)
+		set( Boost_INCLUDE_DIR $ENV{BOOST_ROOT}/include/boost-1_69)
+		FIND_PACKAGE(Boost COMPONENTS filesystem-mgw73-mt-x64-1_69  system-mgw73-mt-x64-1_69  date_time-mgw73-mt-x64-1_69 thread-mgw73-mt-x64-1_69 regex-mgw73-mt-x64-1_69 program_options-mgw73-mt-x64-1_69  REQUIRED)
+	ELSE (MINGW)
+#		FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time thread regex program_options REQUIRED)
+		FIND_PACKAGE(Boost COMPONENTS filesystem system  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})	 
@@ -407,9 +417,11 @@ IF(USE_XERCES)
 		ENDIF(NOT XERCES_LIB_DIR)   	
 		
 		IF(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  xerces-c_3D)
+#EED 2019-07-03			set(XERCES_LIBRARIES  xerces-c_3D)
+			set(XERCES_LIBRARIES  xerces-c)
 		ELSE(USE_DEBUG_LIB)
-			set(XERCES_LIBRARIES  xerces-c_3)
+#EED 2019-07-03			set(XERCES_LIBRARIES  xerces-c_3)
+			set(XERCES_LIBRARIES  xerces-c)
 		ENDIF(USE_DEBUG_LIB)
 		
 		MARK_AS_ADVANCED(XERCES_LIB_DIR)