vtk9itk5wx3-macos

[crea.git] / cmake / CREAMacro_FindAndUseLibraries.cmake

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index c9428581bdbd38a6998f9c82d6c490001959ae4e..e5976cd3a823da0f8fc19be0049044f760fc04d4 100644 (file)
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -114,6 +114,7 @@ IF(USE_ITK)
                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}) 
+                       MESSAGE ( STATUS "${ITK_LIBRARIES}")
                ELSEIF()
                        SET(ITK_LIBRARIES ITKCommon ITKIO ITKBasicFilters ITKAlgorithms)
                ENDIF()
@@ -326,12 +327,17 @@ IF(USE_BOOST)
        add_definitions( -DBOOST_ALL_NO_LIB )
        add_definitions( -DBOOST_ALL_DYN_LINK )
        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)
+               IF(APPLE)
+                       FIND_PACKAGE(Boost COMPONENTS filesystem-mgw71 system-mgw71 signals-mgw71 date_time-mgw71 thread-mgw71 regex-mgw71 program_options-mgw71 REQUIRED)
+               ELSE(APPLE)
+                       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)
+               ENDIF(APPLE)
        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)
+#EED 2022-07-23
+#              FIND_PACKAGE(Boost COMPONENTS filesystem system  date_time thread regex program_options REQUIRED)
+               FIND_PACKAGE(Boost COMPONENTS filesystem system  date_time  regex program_options REQUIRED)
        ENDIF(MINGW)
     IF(Boost_FOUND) 
          ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=3)
@@ -367,6 +373,7 @@ IF(USE_BOOST)
 #              ENDIF(USE_DEBUG_LIB)    
          ENDIF(WIN32)
       IF(NOT WIN32)
+message("EED 2021 CREAMacro_FindAndUseLibraries " ${Boost_LIBRARIES} )
 
                  SET(BOOST_LIBRARIES
 
@@ -416,13 +423,21 @@ IF(USE_XERCES)
                  
                ENDIF(NOT XERCES_LIB_DIR)       
                
-               IF(USE_DEBUG_LIB)
-#EED 2019-07-03                        set(XERCES_LIBRARIES  xerces-c_3D)
-                       set(XERCES_LIBRARIES  xerces-c)
-               ELSE(USE_DEBUG_LIB)
-#EED 2019-07-03                        set(XERCES_LIBRARIES  xerces-c_3)
-                       set(XERCES_LIBRARIES  xerces-c)
-               ENDIF(USE_DEBUG_LIB)
+               IF(APPLE)
+                       IF(USE_DEBUG_LIB)
+                               set(XERCES_LIBRARIES  xerces-c_3D)
+                       ELSE(USE_DEBUG_LIB)
+                               set(XERCES_LIBRARIES  xerces-c_3)
+                       ENDIF(USE_DEBUG_LIB)
+               ELSEIF(APPLE)
+                       IF(USE_DEBUG_LIB)
+                               #EED 2019-07-03                 set(XERCES_LIBRARIES  xerces-c_3D)
+                               set(XERCES_LIBRARIES  xerces-c)
+                       ELSE(USE_DEBUG_LIB)
+                               #EED 2019-07-03                 set(XERCES_LIBRARIES  xerces-c_3)
+                               set(XERCES_LIBRARIES  xerces-c)
+                       ENDIF(USE_DEBUG_LIB)
+               ENDIF(APPLE)
                
                MARK_AS_ADVANCED(XERCES_LIB_DIR)
        ENDIF(WIN32)