[Cmake-commits] CMake branch, next, updated. v2.8.2-1114-g79b5cd4

Dave Partyka dave.partyka at kitware.com
Tue Oct 26 11:20:23 EDT 2010


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  79b5cd4ed940032425fe34661cd6cb1d13e8aaac (commit)
       via  bee4802840607c22d9d37cda8464c17fcdf26529 (commit)
      from  ad8b6542017a5bccd22108d6721d66588bd7b8c4 (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=79b5cd4ed940032425fe34661cd6cb1d13e8aaac
commit 79b5cd4ed940032425fe34661cd6cb1d13e8aaac
Merge: ad8b654 bee4802
Author:     Dave Partyka <dave.partyka at kitware.com>
AuthorDate: Tue Oct 26 11:20:21 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 26 11:20:21 2010 -0400

    Merge topic 'getprerequisites-endless-path-appending' into next
    
    bee4802 Append the gp_tool path to the system PATH using native slashes.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bee4802840607c22d9d37cda8464c17fcdf26529
commit bee4802840607c22d9d37cda8464c17fcdf26529
Author:     David Partyka <dave.partyka at kitware.com>
AuthorDate: Tue Oct 26 11:12:12 2010 -0400
Commit:     David Partyka <dave.partyka at kitware.com>
CommitDate: Tue Oct 26 11:12:12 2010 -0400

    Append the gp_tool path to the system PATH using native slashes.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index e51ab57..c877308 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -600,6 +600,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
       endforeach(gp_env_path_element)
 
       if(NOT gp_found_cmd_dlls_dir)
+        file(TO_NATIVE_PATH "${gp_cmd_dlls_dir}" gp_cmd_dlls_dir)
         set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}")
       endif()
     endif(EXISTS "${gp_cmd_dlls_dir}")

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list