[Cmake-commits] CMake branch, next, updated. v2.8.4-1459-g2bcf3e0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2bcf3e0c7f7e19879eafbc18284a6ae65a57643a (commit)
       via  aa170c20f7353a1781e7886b705908add569f027 (commit)
      from  f7e0ea7b6ee08178dcdbba9ccbdff3426494ecdc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bcf3e0c7f7e19879eafbc18284a6ae65a57643a
commit 2bcf3e0c7f7e19879eafbc18284a6ae65a57643a
Merge: f7e0ea7 aa170c2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 18 14:15:11 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 18 14:15:11 2011 -0400

    Merge topic 'FindITK-passthru' into next
    
    aa170c2 FindITK: Use passthru find_package config mode for messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa170c20f7353a1781e7886b705908add569f027
commit aa170c20f7353a1781e7886b705908add569f027
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 18 14:11:54 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 18 14:11:54 2011 -0400

    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.

diff --git a/Modules/FindITK.cmake b/Modules/FindITK.cmake
index 5f43dd9..a3ca998 100644
--- a/Modules/FindITK.cmake
+++ b/Modules/FindITK.cmake
@@ -37,19 +37,21 @@
 # If this succeeds (possibly because ITK_DIR is already set), the
 # command will have already loaded ITKConfig.cmake and set 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
     CONFIGS ITKConfig.cmake
     )
 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)
   # Set USE_ITK_FILE for backward-compatability.
   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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindITK.cmake |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake