X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseLibraries.cmake;h=ae8f19beed1dcfb444c9acb792f141744cbd5a70;hb=refs%2Fheads%2Fvtk8itk4wx3-mingw64;hp=1f5cf0b2102eb18fcf29a8fd30a064627094dded;hpb=70ae3bca8b87c45d33b75bb82b6523f2e46c9bc8;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 1f5cf0b..ae8f19b 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -327,7 +327,11 @@ 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})
@@ -412,9 +416,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)