X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseLibraries.cmake;h=ed5ea3b5e9538c5801791c29b59e5ba215fa9a24;hb=f09a2294921d213f7ae842d8ee88a3417d08e736;hp=9af88a16b989113eb383999e3746f3039d1b8232;hpb=a0c9136d78d21bf25d58a2d7205aa7b196027193;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 9af88a1..ed5ea3b 100644
--- 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)