[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5461-g7c69fbe

[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  7c69fbe353667689e28b8b0ba3aeb18fedbc3caa (commit)
       via  e2e6a8a2f5d4c04fd02f2047030ed506fc117cbb (commit)
      from  24bce6722f8077256e93d8ade373ca76f10dae9c (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=7c69fbe353667689e28b8b0ba3aeb18fedbc3caa
commit 7c69fbe353667689e28b8b0ba3aeb18fedbc3caa
Merge: 24bce67 e2e6a8a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 14:51:50 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 14:51:50 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    e2e6a8a Simplify the test.


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

    Simplify the test.
    
    The build output does not need to be recorded.

diff --git a/Tests/StagingPrefix/CMakeLists.txt b/Tests/StagingPrefix/CMakeLists.txt
index be828aa..7dce67d 100644
--- a/Tests/StagingPrefix/CMakeLists.txt
+++ b/Tests/StagingPrefix/CMakeLists.txt
@@ -26,34 +26,6 @@ else()
   endif()
 endif()
 
-if(WIN32)
-  set(scriptExt bat)
-else()
-  set(scriptExt sh)
-endif()
-
-macro(write_make_script name)
-  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_COMMAND} --build . --target install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
-  )
-  file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.${scriptExt}"
-    DESTINATION "${CMAKE_BINARY_DIR}"
-    FILE_PERMISSIONS
-      OWNER_READ OWNER_EXECUTE
-  )
-endmacro()
-
-write_make_script(Producer)
-
 # Build and install the producer.
 add_custom_command(
   OUTPUT ${CMAKE_BINARY_DIR}/ProducerProject
@@ -63,9 +35,9 @@ add_custom_command(
     ${CMAKE_BINARY_DIR}/Producer
     --build-noclean
     --build-project Producer
+    --build-target install
     --build-generator ${CMAKE_GENERATOR}
     --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-    --build-makeprogram "${CMAKE_BINARY_DIR}/MakeProducer.${scriptExt}"
     --build-options
       -DCMAKE_VERBOSE_MAKEFILE=1
       "-DCMAKE_STAGING_PREFIX=${CMAKE_BINARY_DIR}/stage"
@@ -80,8 +52,6 @@ set_property(
   PROPERTY SYMBOLIC 1
   )
 
-write_make_script(Consumer)
-
 if(NOT WIN32)
   file(WRITE
     "${CMAKE_BINARY_DIR}/ignored/${CMAKE_BINARY_DIR}/stage/include/ignored.h"
@@ -98,9 +68,9 @@ add_custom_command(
    ${CMAKE_BINARY_DIR}/Consumer
    --build-noclean
    --build-project Consumer
+   --build-target install
    --build-generator ${CMAKE_GENERATOR}
    --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
-   --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 |   34 ++--------------------------------
 1 files changed, 2 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
CMake