#-----------------------------------------------------------------------------
+
IF(USE_QT4)
IF(NOT QT_FOUND)
INCLUDE(${QT_USE_FILE})
CREA_DEFINE( USE_QT )
- # SET(QT_LIBRARIES
- # ${QT_LIBRARIES}
- # )
- # MARK_AS_ADVANCED(Qt4_DIR)
+
ENDIF(QT_FOUND)
ENDIF(NOT QT_FOUND)
ENDIF(USE_QT4)
+
+
+#JFGA Pruebas WT
+#MESSAGE ( "======================================= SET CMAKE USE_WT JFGA CREAMacro_FindAndUseLibraries.cmake")
+#SET(USE_WT OFF)
+
+
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
ENDIF(USE_KWWIDGETS)
#-----------------------------------------------------------------------------
-
+# --- W A R N I N G :
+# Always let ITK *BEFORE* GDCM
+# It allows to use 'system installed gdcm' instead of 'itk embedded gdcm'
+#
#-----------------------------------------------------------------------------
+
IF(USE_ITK)
IF(NOT ITK_FOUND)
# Search ITK
INCLUDE(${ITK_USE_FILE})
CREA_DEFINE( USE_ITK )
CREA_DEFINE( _USE_ITK_ )
- SET(ITK_LIBRARIES
- ITKCommon ITKIO ITKBasicFilters ITKAlgorithms
- )
+ 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)
+ ENDIF()
MARK_AS_ADVANCED(ITK_DIR)
ELSE(ITK_FOUND)
message(FATAL_ERROR "ITK_DIR not found")
#-----------------------------------------------------------------------------
+
IF(USE_GDCM)
IF (USE_GDCM2)
MESSAGE(ERROR "CANNOT USE BOTH gdcm AND gdcm2 !")
MESSAGE(ERROR "CANNOT USE BOTH gdcm AND gdcm2 !")
ENDIF (USE_GDCM)
- IF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break)
+# IF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break)
# Search GDCM2
+
FIND_PACKAGE(GDCM REQUIRED)
INCLUDE(${GDCM_USE_FILE})
# Test that GDCM_NAME_SPACE is **NOT** "gdcm" or will conflict with
# embedded gdcm in ITK and will result in hard seg faults !
- INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIR})
- LINK_DIRECTORIES( ${GDCM_LIBRARY_DIR})
-
+ INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
+ LINK_DIRECTORIES( ${GDCM_LIBRARY_DIRS})
+
SET(GDCM2_LIBRARIES
${GDCM_LIBRARIES}
)
SET(GDCM_LIBRARIES
${GDCM_LIBRARIES}
vtkgdcm
- #gdcm2vtk
+ gdcmIOD
+ gdcmMSFF
+ gdcmexpat
+ gdcmCommon
+ gdcmMEXD
+ gdcmexpat
+ gdcmDSED
+ gdcmDICT
+ gdcmjpeg8
+ gdcmjpeg12
+ gdcmjpeg16
+ socketxx
+ gdcmopenjpeg
+ gdcmcharls
)
ELSE(WIN32)
SET(GDCM_LIBRARIES
${GDCM_LIBRARIES}
vtkgdcm
+ gdcmIOD
)
ENDIF(WIN32)
ENDIF(USE_VTK)
ENDIF(USE_GDCM_VTK)
- ENDIF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break)
+ # ENDIF(NOT USE_ITK) # JPR : ITK vs GDCM (avoid cmake break)
ENDIF(USE_GDCM2)
#-----------------------------------------------------------------------------
+#-------------------- JFGA ---
+IF(USE_WT)
+ MESSAGE ( "======================================= JFGA ------------USE WT CREAMacro_FindAndUseLibraries.cmake")
+ INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseWt.cmake)
+ CREA_FINDANDUSEWT()
+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)
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
IF(USE_BOOST)
IF(NOT Boost_FOUND)
- FIND_PACKAGE(Boost COMPONENTS filesystem signals date_time regex REQUIRED)
- IF(Boost_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-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})
- LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS})
+ LINK_DIRECTORIES( ${Boost_LIBRARY_DIRS})
IF(WIN32)
CREA_DEFINE( USE_BOOST )
-
+ ADD_DEFINITIONS(-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
SET(BOOST_LIBRARIES
${Boost_LIBRARIES}
)
+
# FCY with cmake boost, it's useless.
# But if it is not working, uncomment
#
SET(BOOST_LIBRARIES
${Boost_LIBRARIES}
- boost_system-mt
- boost_thread-mt
- boost_program_options-mt
+#EED 10 Fev 2014
+#EED boost_system-mt
+#EED boost_thread-mt
+#EED boost_program_options-mt
#EED 03 mars 2011
#EED boost_signals-mt
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)
git://git.creatis.insa-lyon.fr / crea.git / blobdiff