[Cmake-commits] CMake branch, next, updated. v2.8.8-3259-g1e74a9f

[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  1e74a9fdb7f0253c689ad47026bc8e56e72e47a1 (commit)
       via  3505e684664d4d48bedd5f4d9ed6dd496691a914 (commit)
      from  7a9dfe9644dfd4a75efe41e0dcb73d26cc11d27a (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=1e74a9fdb7f0253c689ad47026bc8e56e72e47a1
commit 1e74a9fdb7f0253c689ad47026bc8e56e72e47a1
Merge: 7a9dfe9 3505e68
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jun 19 15:08:56 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 15:08:56 2012 -0400

    Merge topic 'use-string-to-cmake-path' into next
    
    3505e68 replace open coded versions of file(TO_CMAKE_PATH)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3505e684664d4d48bedd5f4d9ed6dd496691a914
commit 3505e684664d4d48bedd5f4d9ed6dd496691a914
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Mar 29 00:19:55 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jun 19 21:08:44 2012 +0200

    replace open coded versions of file(TO_CMAKE_PATH)

diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index bb18a2e..5e9e722 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -79,18 +79,14 @@ SET(FLTK_DIR_STRING "directory containing FLTKConfig.cmake.  This is either the
 # Search only if the location is not already known.
 IF(NOT FLTK_DIR)
   # Get the system search path as a list.
-  IF(UNIX)
-    STRING(REGEX MATCHALL "[^:]+" FLTK_DIR_SEARCH1 "$ENV{PATH}")
-  ELSE(UNIX)
-    STRING(REGEX REPLACE "\\\\" "/" FLTK_DIR_SEARCH1 "$ENV{PATH}")
-  ENDIF(UNIX)
-  STRING(REGEX REPLACE "/;" ";" FLTK_DIR_SEARCH2 ${FLTK_DIR_SEARCH1})
+  FILE(TO_CMAKE_PATH "$ENV{PATH}" FLTK_DIR_SEARCH2)
 
   # Construct a set of paths relative to the system search path.
   SET(FLTK_DIR_SEARCH "")
   FOREACH(dir ${FLTK_DIR_SEARCH2})
     SET(FLTK_DIR_SEARCH ${FLTK_DIR_SEARCH} "${dir}/../lib/fltk")
   ENDFOREACH(dir)
+  STRING(REPLACE "//" "/" FLTK_DIR_SEARCH "${FLTK_DIR_SEARCH}")
 
   #
   # Look for an installation or build tree.
diff --git a/Modules/FindFLTK2.cmake b/Modules/FindFLTK2.cmake
index 436e280..f6fad5b 100644
--- a/Modules/FindFLTK2.cmake
+++ b/Modules/FindFLTK2.cmake
@@ -59,18 +59,14 @@ SET(FLTK2_DIR_STRING "directory containing FLTK2Config.cmake.  This is either th
 # Search only if the location is not already known.
 IF(NOT FLTK2_DIR)
   # Get the system search path as a list.
-  IF(UNIX)
-    STRING(REGEX MATCHALL "[^:]+" FLTK2_DIR_SEARCH1 "$ENV{PATH}")
-  ELSE(UNIX)
-    STRING(REGEX REPLACE "\\\\" "/" FLTK2_DIR_SEARCH1 "$ENV{PATH}")
-  ENDIF(UNIX)
-  STRING(REGEX REPLACE "/;" ";" FLTK2_DIR_SEARCH2 ${FLTK2_DIR_SEARCH1})
+  FILE(TO_CMAKE_PATH "$ENV{PATH}" FLTK2_DIR_SEARCH2)
 
   # Construct a set of paths relative to the system search path.
   SET(FLTK2_DIR_SEARCH "")
   FOREACH(dir ${FLTK2_DIR_SEARCH2})
     SET(FLTK2_DIR_SEARCH ${FLTK2_DIR_SEARCH} "${dir}/../lib/fltk")
   ENDFOREACH(dir)
+  STRING(REPLACE "//" "/" FLTK2_DIR_SEARCH "${FLTK2_DIR_SEARCH}")
 
   #
   # Look for an installation or build tree.
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index b0b6b2f..48d195a 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -43,18 +43,14 @@ SET(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.")
 # Search only if the location is not already known.
 IF(NOT SQUISH_INSTALL_DIR)
   # Get the system search path as a list.
-  IF(UNIX)
-    STRING(REGEX MATCHALL "[^:]+" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
-  ELSE(UNIX)
-    STRING(REGEX REPLACE "\\\\" "/" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
-  ENDIF(UNIX)
-  STRING(REGEX REPLACE "/;" ";" SQUISH_INSTALL_DIR_SEARCH2 ${SQUISH_INSTALL_DIR_SEARCH1})
+  FILE(TO_CMAKE_PATH "$ENV{PATH}" SQUISH_INSTALL_DIR_SEARCH2)
 
   # Construct a set of paths relative to the system search path.
   SET(SQUISH_INSTALL_DIR_SEARCH "")
   FOREACH(dir ${SQUISH_INSTALL_DIR_SEARCH2})
     SET(SQUISH_INSTALL_DIR_SEARCH ${SQUISH_INSTALL_DIR_SEARCH} "${dir}/../lib/fltk")
   ENDFOREACH(dir)
+  STRING(REPLACE "//" "/" SQUISH_INSTALL_DIR_SEARCH "${SQUISH_INSTALL_DIR_SEARCH}")
 
   # Look for an installation
   FIND_PATH(SQUISH_INSTALL_DIR bin/squishrunner

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

Summary of changes:
 Modules/FindFLTK.cmake   |    8 ++------
 Modules/FindFLTK2.cmake  |    8 ++------
 Modules/FindSquish.cmake |    8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
CMake