#
#-----------------------------------------------------------------------------
+
IF(USE_ITK)
IF(NOT ITK_FOUND)
# Search 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)
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)
+## FIND_PACKAGE(Boost COMPONENTS filesystem-mgw71 system-mgw71 signals-mgw71 date_time-mgw71 thread-mgw71 regex-mgw71 program_options-mgw71 REQUIRED)
+ 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 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)
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)