[Cmake-commits] CMake branch, next, updated. v2.8.7-2976-g28743fa

[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  28743fa6c3ac16b303803661d0d05253b3efc0ac (commit)
       via  5cd879c4e75405ab404a2e6c4e77caa36877baf1 (commit)
      from  90ab2fb96596c9a17ff92fe60c683eca5c919317 (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=28743fa6c3ac16b303803661d0d05253b3efc0ac
commit 28743fa6c3ac16b303803661d0d05253b3efc0ac
Merge: 90ab2fb 5cd879c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 1 10:12:20 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 1 10:12:20 2012 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cd879c4e75405ab404a2e6c4e77caa36877baf1
commit 5cd879c4e75405ab404a2e6c4e77caa36877baf1
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: Thu Mar 1 10:09:05 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.
    
    Some MSYS bash implementations leave trailing space on the command line
    to 'cmd /c echo ...' after quoting the message.  The Windows echo tool
    preserves both the quotes and the trailing space.  Use a sed expression
    that strips quotes and trailing spaces after the end quote.

diff --git a/bootstrap b/bootstrap
index f5eacbd..665c6c5 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:


hooks/post-receive
-- 
CMake