#3374 creaBug New Normal - vtk8itk5wx3-mingw64

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 52919c30b4c978cc78ceddf5ea20d15023fcfe86..ed5ea3b5e9538c5801791c29b59e5ba215fa9a24 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -96,6 +96,7 @@ ENDIF(USE_KWWIDGETS)
 #
 
 #-----------------------------------------------------------------------------
+
 IF(USE_ITK)
   IF(NOT ITK_FOUND)
     # Search ITK
@@ -110,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)
@@ -330,7 +328,8 @@ IF(USE_BOOST)
        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)
+#              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)
@@ -416,9 +415,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)