[Cmake-commits] CMake branch, next, updated. v2.8.2-330-g7844312

[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  784431236ef0b3b5a16205623fba5fffb23aa636 (commit)
       via  ed43ea603f9ea8c4eed53315e4987483c5801c63 (commit)
      from  4de4af4bc910addcbdd97ef373b5a04bb5824d05 (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=784431236ef0b3b5a16205623fba5fffb23aa636
commit 784431236ef0b3b5a16205623fba5fffb23aa636
Merge: 4de4af4 ed43ea6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 3 09:56:23 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 3 09:56:23 2010 -0400

    Merge topic 'ExternalProject-cygwin-make' into next
    
    ed43ea6 ExternalProject: Fix $(MAKE) with cygpath on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed43ea603f9ea8c4eed53315e4987483c5801c63
commit ed43ea603f9ea8c4eed53315e4987483c5801c63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 2 12:02:15 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 2 12:02:15 2010 -0400

    ExternalProject: Fix $(MAKE) with cygpath on Windows
    
    In non-cygwin builds using Cygwin's make tool, use cygpath to transform
    the value of $(MAKE) to something Windows understands.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b4359c8..e15d537 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -621,11 +621,29 @@ function(_ep_write_log_script name step cmd_var)
   set(command "${${cmd_var}}")
 
   set(make "")
+  set(code_cygpath_make "")
   if("${command}" MATCHES "^\\$\\(MAKE\\)")
     # GNU make recognizes the string "$(MAKE)" as recursive make, so
     # ensure that it appears directly in the makefile.
     string(REGEX REPLACE "^\\$\\(MAKE\\)" "\${make}" command "${command}")
     set(make "-Dmake=$(MAKE)")
+
+    if(WIN32 AND NOT CYGWIN)
+      set(code_cygpath_make "
+if(\${make} MATCHES \"^/\")
+  execute_process(
+    COMMAND cygpath -w \${make}
+    OUTPUT_VARIABLE cygpath_make
+    ERROR_VARIABLE cygpath_make
+    RESULT_VARIABLE cygpath_error
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(NOT cygpath_error)
+    set(make \${cygpath_make})
+  endif()
+endif()
+")
+    endif()
   endif()
 
   set(config "")
@@ -638,6 +656,7 @@ function(_ep_write_log_script name step cmd_var)
   # script so all output can be sent to one log file.
   if("${command}" MATCHES ";COMMAND;")
     set(code_execute_process "
+${code_cygpath_make}
 execute_process(COMMAND \${command} RESULT_VARIABLE result)
 if(result)
   set(msg \"Command failed (\${result}):\\n\")
@@ -669,6 +688,7 @@ endif()
   set(script ${stamp_dir}/${name}-${step}.cmake)
   set(logbase ${stamp_dir}/${name}-${step})
   file(WRITE ${script} "
+${code_cygpath_make}
 set(command \"${command}\")
 execute_process(
   COMMAND \${command}

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

Summary of changes:


hooks/post-receive
-- 
CMake