[Cmake-commits] CMake branch, next, updated. v2.8.2-1112-gad8b654

[Dave Partyka]

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  ad8b6542017a5bccd22108d6721d66588bd7b8c4 (commit)
       via  8e550ba31e6b68d85f96bcb833d65e937a7139e2 (commit)
       via  16841987064cb79d3556034384458a36c4ceecef (commit)
      from  1f81929a0761b276be28d86cef2ca77a5cd25683 (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=ad8b6542017a5bccd22108d6721d66588bd7b8c4
commit ad8b6542017a5bccd22108d6721d66588bd7b8c4
Merge: 1f81929 8e550ba
Author:     Dave Partyka <dave.partyka at kitware.com>
AuthorDate: Tue Oct 26 10:50:50 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 26 10:50:50 2010 -0400

    Merge topic 'getprerequisites-endless-path-appending' into next
    
    8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
    1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e550ba31e6b68d85f96bcb833d65e937a7139e2
commit 8e550ba31e6b68d85f96bcb833d65e937a7139e2
Author:     David Partyka <dave.partyka at kitware.com>
AuthorDate: Tue Oct 26 10:27:41 2010 -0400
Commit:     David Partyka <dave.partyka at kitware.com>
CommitDate: Tue Oct 26 10:28:42 2010 -0400

    Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.
    
    It is already using CMAKE style paths.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 40b682e..e51ab57 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -589,7 +589,6 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE)
     # Use cmake paths as a user may have a PATH element ending with a backslash.
     # This will escape the list delimiter and create havoc!
-    file(TO_CMAKE_PATH "${gp_cmd_dlls_dir}" gp_cmd_dlls_dir)
     if(EXISTS "${gp_cmd_dlls_dir}")
       # only add to the path if it is not already in the path
       set(gp_found_cmd_dlls_dir 0)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16841987064cb79d3556034384458a36c4ceecef
commit 16841987064cb79d3556034384458a36c4ceecef
Author:     David Partyka <dave.partyka at kitware.com>
AuthorDate: Tue Oct 26 10:03:21 2010 -0400
Commit:     David Partyka <dave.partyka at kitware.com>
CommitDate: Tue Oct 26 10:28:38 2010 -0400

    Switch to CMAKE_PATH when doing PATH comparisons on Windows.
    
    Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches.
    
    Fix indentation.
    
    Fix whitespace

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index e1dae46..40b682e 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -587,11 +587,14 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     #
     get_filename_component(gp_cmd_dir "${gp_cmd}" PATH)
     get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE)
-    file(TO_NATIVE_PATH "${gp_cmd_dlls_dir}" gp_cmd_dlls_dir)
+    # Use cmake paths as a user may have a PATH element ending with a backslash.
+    # This will escape the list delimiter and create havoc!
+    file(TO_CMAKE_PATH "${gp_cmd_dlls_dir}" gp_cmd_dlls_dir)
     if(EXISTS "${gp_cmd_dlls_dir}")
       # only add to the path if it is not already in the path
       set(gp_found_cmd_dlls_dir 0)
-      foreach(gp_env_path_element $ENV{PATH})
+      file(TO_CMAKE_PATH "$ENV{PATH}" env_path)
+      foreach(gp_env_path_element ${env_path})
         if("${gp_env_path_element}" STREQUAL "${gp_cmd_dlls_dir}")
           set(gp_found_cmd_dlls_dir 1)
         endif()

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

Summary of changes:
 Modules/GetPrerequisites.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake