X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseLibraries.cmake;h=49ff5bf3086b2678ca11c579a075ca9fc6755b69;hb=a7d910c07f6ef2ab39e9bf1ba3b031126de8b41c;hp=cff4b656c931d6873bde7575383f41c5d3342b91;hpb=5cdb41d3ebada2a69468bade1da67bf0f9a86864;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index cff4b65..49ff5bf 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -105,9 +105,15 @@ IF(USE_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")
+	   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()
       MARK_AS_ADVANCED(ITK_DIR)
     ELSE(ITK_FOUND)
       message(FATAL_ERROR "ITK_DIR not found")
@@ -176,8 +182,9 @@ IF(USE_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})
 
@@ -197,9 +204,9 @@ IF(USE_GDCM2)
       
       # 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} 
 	)
@@ -210,18 +217,32 @@ IF(USE_GDCM2)
 		  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)
 
@@ -288,18 +309,22 @@ ENDIF(USE_TTH)
 #-----------------------------------------------------------------------------
 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 )
+    FIND_PACKAGE(Boost COMPONENTS filesystem system signals date_time regex REQUIRED)
+    IF(Boost_FOUND) 
+	  ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=3)
       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	
 #