[Cmake-commits] CMake branch, next, updated. v2.8.7-2968-gf857e77

[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  f857e77536ad50bc68050d31ab84a15c81a9c017 (commit)
       via  7f7679e69a5d1360c1c654248b8b1e67d1dbadf3 (commit)
      from  ab88aeb57d387c38e878e1535742065f3da8e831 (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=f857e77536ad50bc68050d31ab84a15c81a9c017
commit f857e77536ad50bc68050d31ab84a15c81a9c017
Merge: ab88aeb 7f7679e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 29 14:39:04 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 29 14:39:04 2012 -0500

    Merge topic 'bootstrap-msys-paths' into next
    
    7f7679e bootstrap: Convert MSYS paths to Windows format (#13001)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f7679e69a5d1360c1c654248b8b1e67d1dbadf3
commit 7f7679e69a5d1360c1c654248b8b1e67d1dbadf3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 29 14:29:16 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 29 14:30:15 2012 -0500

    bootstrap: Convert MSYS paths to Windows format (#13001)
    
    We set CMAKE_PREFIX_PATH from the --prefix= option.  The calling shell
    might not translate "/c/..." to "c:/..." paths but we need to store
    Windows paths in CMake cache variables.  Pass the specified path through
    the MSYS shell in a form it will convert to a Windows path using the
    MSYS fstab.

diff --git a/bootstrap b/bootstrap
index f5eacbd..c67c28e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -127,10 +127,20 @@ fi
 cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap${_cmk}"
 
 # Helper function to fix windows paths.
-cmake_fix_slashes ()
-{
-  echo "$1" | sed 's/\\/\//g'
-}
+case "${cmake_system}" in
+*MINGW*)
+  cmake_fix_slashes()
+  {
+    cmd //c echo "$(echo "$1" | sed 's/\\/\//g')" | sed 's/^"//;s/"$//'
+  }
+  ;;
+*)
+  cmake_fix_slashes()
+  {
+    echo "$1" | sed 's/\\/\//g'
+  }
+  ;;
+esac
 
 # Choose the default install prefix.
 if ${cmake_system_mingw}; then

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

Summary of changes:
 bootstrap |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake