浏览代码

FindITK: Use passthru find_package config mode for messages

The custom error message that mentions PREFIX/lib/InsightToolkit is not
accurate for ITKv4.  Just use the more generic message that find_package
generates by default.  This module is now almost a no-op but exists to
tell find_package to look for the InsightToolkit name as well as ITK.
Brad King 14 年之前
父节点
当前提交
aa170c20f7
共有 1 个文件被更改,包括 9 次插入7 次删除
  1. 9 7
      Modules/FindITK.cmake

+ 9 - 7
Modules/FindITK.cmake

@@ -37,19 +37,21 @@
 # If this succeeds (possibly because ITK_DIR is already set), the
 # If this succeeds (possibly because ITK_DIR is already set), the
 # command will have already loaded ITKConfig.cmake and set ITK_FOUND.
 # command will have already loaded ITKConfig.cmake and set ITK_FOUND.
 IF(NOT ITK_FOUND)
 IF(NOT ITK_FOUND)
-  FIND_PACKAGE(ITK QUIET NO_MODULE
+  SET(_ITK_REQUIRED "")
+  IF(ITK_FIND_REQUIRED)
+    SET(_ITK_REQUIRED REQUIRED)
+  ENDIF()
+  SET(_ITK_QUIET "")
+  IF(ITK_FIND_QUIETLY)
+    SET(_ITK_QUIET QUIET)
+  ENDIF()
+  FIND_PACKAGE(ITK ${_ITK_REQUIRED} ${_ITK_QUIET} NO_MODULE
     NAMES ITK InsightToolkit
     NAMES ITK InsightToolkit
     CONFIGS ITKConfig.cmake
     CONFIGS ITKConfig.cmake
     )
     )
 ENDIF()
 ENDIF()
 
 
-SET(ITK_DIR_MESSAGE "Please set ITK_DIR to the directory containing ITKConfig.cmake.  This is either the root of the build tree, or PREFIX/lib/InsightToolkit for an installation.")
-
 IF(ITK_FOUND)
 IF(ITK_FOUND)
   # Set USE_ITK_FILE for backward-compatability.
   # Set USE_ITK_FILE for backward-compatability.
   SET(USE_ITK_FILE ${ITK_USE_FILE})
   SET(USE_ITK_FILE ${ITK_USE_FILE})
-ELSEIF(ITK_FIND_REQUIRED)
-  MESSAGE(FATAL_ERROR ${ITK_DIR_MESSAGE})
-ELSEIF(NOT ITK_FIND_QUIETLY)
-  MESSAGE(STATUS ${ITK_DIR_MESSAGE})
 ENDIF()
 ENDIF()