[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5459-g24bce67

[Stephen Kelly]

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  24bce6722f8077256e93d8ade373ca76f10dae9c (commit)
       via  c7d2c4e7ae0ad14d632621182b0024fc809a47b5 (commit)
       via  cafec9c4f809bbce826aac10d1b92caf542827f0 (commit)
      from  99a867a249676c68a96803d0e00dd0be4b69b00a (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=24bce6722f8077256e93d8ade373ca76f10dae9c
commit 24bce6722f8077256e93d8ade373ca76f10dae9c
Merge: 99a867a c7d2c4e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 14:45:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 14:45:30 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    c7d2c4e Delegate building to CMake, not to a particular makeprogram.
    cafec9c Try to make this test work on Windows.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7d2c4e7ae0ad14d632621182b0024fc809a47b5
commit c7d2c4e7ae0ad14d632621182b0024fc809a47b5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 20:43:24 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 20:44:52 2013 +0100

    Delegate building to CMake, not to a particular makeprogram.

diff --git a/Tests/StagingPrefix/CMakeLists.txt b/Tests/StagingPrefix/CMakeLists.txt
index 9123f85..be828aa 100644
--- a/Tests/StagingPrefix/CMakeLists.txt
+++ b/Tests/StagingPrefix/CMakeLists.txt
@@ -43,7 +43,7 @@ macro(write_make_script name)
     )
   endif()
   file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
-    "${CMAKE_MAKE_PROGRAM} install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
+    "${CMAKE_COMMAND} --build . --target install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
   )
   file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
     DESTINATION "${CMAKE_BINARY_DIR}"

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cafec9c4f809bbce826aac10d1b92caf542827f0
commit cafec9c4f809bbce826aac10d1b92caf542827f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 20:36:20 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 20:37:40 2013 +0100

    Try to make this test work on Windows.

diff --git a/Tests/StagingPrefix/CMakeLists.txt b/Tests/StagingPrefix/CMakeLists.txt
index 751fde5..9123f85 100644
--- a/Tests/StagingPrefix/CMakeLists.txt
+++ b/Tests/StagingPrefix/CMakeLists.txt
@@ -26,11 +26,26 @@ else()
   endif()
 endif()
 
+if(WIN32)
+  set(scriptExt bat)
+else()
+  set(scriptExt sh)
+endif()
+
 macro(write_make_script name)
-  file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.sh"
-    "#!/bin/sh\n${CMAKE_MAKE_PROGRAM} install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
+  if(NOT WIN32)
+    file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
+      "#!/bin/sh\n"
+    )
+  else()
+    file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
+      "\n"
+    )
+  endif()
+  file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
+    "${CMAKE_MAKE_PROGRAM} install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
   )
-  file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.sh"
+  file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
     DESTINATION "${CMAKE_BINARY_DIR}"
     FILE_PERMISSIONS
       OWNER_READ OWNER_EXECUTE
@@ -50,7 +65,7 @@ add_custom_command(
     --build-project Producer
     --build-generator ${CMAKE_GENERATOR}
     --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-    --build-makeprogram "${CMAKE_BINARY_DIR}/MakeProducer.sh"
+    --build-makeprogram "${CMAKE_BINARY_DIR}/MakeProducer.${scriptExt}"
     --build-options
       -DCMAKE_VERBOSE_MAKEFILE=1
       "-DCMAKE_STAGING_PREFIX=${CMAKE_BINARY_DIR}/stage"
@@ -85,7 +100,7 @@ add_custom_command(
    --build-project Consumer
    --build-generator ${CMAKE_GENERATOR}
    --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-   --build-makeprogram "${CMAKE_BINARY_DIR}/MakeConsumer.sh"
+   --build-makeprogram "${CMAKE_BINARY_DIR}/MakeConsumer.${scriptExt}"
    --build-options
       "-DCMAKE_FIND_ROOT_PATH=${CMAKE_BINARY_DIR}/ignored"
       "-DCMAKE_STAGING_PREFIX=${CMAKE_BINARY_DIR}/stage"

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

Summary of changes:
 Tests/StagingPrefix/CMakeLists.txt |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake