[Cmake-commits] CMake branch, next, updated. v2.8.7-2265-g62d2fd6

[Rolf Eike Beer]

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  62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa (commit)
       via  e01fe583b80208b1cd28f429cfac9c866453a994 (commit)
      from  a50d29c3e955b9409c4a1c260d869036f37b9e4d (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=62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa
commit 62d2fd6dcd199f67a0c3ef5c279384d17fdbcfaa
Merge: a50d29c e01fe58
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 12:37:38 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 12:37:38 2012 -0500

    Merge topic 'improve-findtclsh' into next
    
    e01fe58 FindTclsh: support version selection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e01fe583b80208b1cd28f429cfac9c866453a994
commit e01fe583b80208b1cd28f429cfac9c866453a994
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 18:37:00 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 18:37:25 2012 +0100

    FindTclsh: support version selection

diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 13f32f8..f2c776f 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -48,10 +48,14 @@ INCLUDE(CMakeFindFrameworks)
 INCLUDE(FindTclsh)
 INCLUDE(FindWish)
 
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-STRING(REGEX REPLACE 
-  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+IF(TCLSH_VERSION_STRING)
+  SET(TCL_TCLSH_VERSION "${TCLSH_VERSION_STRING}")
+ELSE(TCLSH_VERSION_STRING)
+  GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
+  GET_FILENAME_COMPONENT(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
+  STRING(REGEX REPLACE
+    "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
+ENDIF(TCLSH_VERSION_STRING)
 
 GET_FILENAME_COMPONENT(TK_WISH_PATH "${TK_WISH}" PATH)
 GET_FILENAME_COMPONENT(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
diff --git a/Modules/FindTclsh.cmake b/Modules/FindTclsh.cmake
index 8fde59e..a45f285 100644
--- a/Modules/FindTclsh.cmake
+++ b/Modules/FindTclsh.cmake
@@ -82,9 +82,19 @@ FIND_PROGRAM(TCL_TCLSH
   HINTS ${TCLTK_POSSIBLE_BIN_PATHS}
   )
 
+IF(TCL_TCLSH)
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -E echo puts "\$tcl_version"
+                   COMMAND "${TCL_TCLSH}"
+                   OUTPUT_VARIABLE TCLSH_VERSION_STRING
+                   ERROR_QUIET
+                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDIF(TCL_TCLSH)
+
 # handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh DEFAULT_MSG TCL_TCLSH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Tclsh
+                                  REQUIRED_VARS TCL_TCLSH
+                                  VERSION_VAR TCLSH_VERSION_STRING)
 
 MARK_AS_ADVANCED(TCL_TCLSH)

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

Summary of changes:
 Modules/FindTCL.cmake   |   12 ++++++++----
 Modules/FindTclsh.cmake |   12 +++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake