From f09a2294921d213f7ae842d8ee88a3417d08e736 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 26 Mar 2020 15:33:52 +0100 Subject: [PATCH] #3374 creaBug New Normal - vtk8itk5wx3-mingw64 --- cmake/CREAMacro_FindAndUseLibraries.cmake | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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) -- 2.47.1