[Cmake-commits] CMake branch, next, updated. v2.8.2-328-g4de4af4

[Bill Hoffman]

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  4de4af4bc910addcbdd97ef373b5a04bb5824d05 (commit)
       via  466cef5a75cc8ea22719285d44cf8ef53db0be22 (commit)
       via  8342eacda7dd78c8776de63d7fe300d751f26f61 (commit)
      from  423218b14cca3d8d85757443d53c7b2eceebbe64 (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=4de4af4bc910addcbdd97ef373b5a04bb5824d05
commit 4de4af4bc910addcbdd97ef373b5a04bb5824d05
Merge: 423218b 466cef5
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Aug 3 09:38:31 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Aug 3 09:38:31 2010 -0400

    Merge branch 'external_project_gmake_cygwin' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=466cef5a75cc8ea22719285d44cf8ef53db0be22
commit 466cef5a75cc8ea22719285d44cf8ef53db0be22
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Aug 3 09:37:31 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Aug 3 09:37:31 2010 -0400

    Fix external project using cygwin gmake with VS compilers.

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:
 Modules/ExternalProject.cmake     |   20 ++++++++++++++++++++
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake