[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5578-gc6884c1

[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  c6884c1c3e2556f024aee3de0dd0c76118f2935a (commit)
       via  6b7e19e9379fff7b455c9bb9031d809db4ee5d20 (commit)
      from  a222298833559bcb309bcfe49346c024284165a5 (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=c6884c1c3e2556f024aee3de0dd0c76118f2935a
commit c6884c1c3e2556f024aee3de0dd0c76118f2935a
Merge: a222298 6b7e19e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 05:04:09 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 21 05:04:09 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    6b7e19e Clean up test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b7e19e9379fff7b455c9bb9031d809db4ee5d20
commit 6b7e19e9379fff7b455c9bb9031d809db4ee5d20
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 21 11:00:03 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 21 11:02:51 2013 +0100

    Clean up test.

diff --git a/Tests/StagingPrefix/CMakeLists.txt b/Tests/StagingPrefix/CMakeLists.txt
index 7dce67d..922776d 100644
--- a/Tests/StagingPrefix/CMakeLists.txt
+++ b/Tests/StagingPrefix/CMakeLists.txt
@@ -5,10 +5,11 @@ project(StagingPrefix)
 # Wipe out the install tree
 add_custom_command(
   OUTPUT ${CMAKE_BINARY_DIR}/CleanupProject
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/Consumer
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/Producer
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/ConsumerBuild
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/ProducerBuild
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/stage
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/prefix
+  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/ignored
   )
 add_custom_target(CleanupTarget ALL DEPENDS ${CMAKE_BINARY_DIR}/CleanupProject)
 set_property(
@@ -32,7 +33,7 @@ add_custom_command(
   COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
     --build-and-test
     ${CMAKE_SOURCE_DIR}/Producer
-    ${CMAKE_BINARY_DIR}/Producer
+    ${CMAKE_BINARY_DIR}/ProducerBuild
     --build-noclean
     --build-project Producer
     --build-target install
@@ -65,7 +66,7 @@ add_custom_command(
   COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
    --build-and-test
    ${CMAKE_SOURCE_DIR}/Consumer
-   ${CMAKE_BINARY_DIR}/Consumer
+   ${CMAKE_BINARY_DIR}/ConsumerBuild
    --build-noclean
    --build-project Consumer
    --build-target install
@@ -74,21 +75,15 @@ add_custom_command(
    --build-options
       "-DCMAKE_FIND_ROOT_PATH=${CMAKE_BINARY_DIR}/ignored"
       "-DCMAKE_STAGING_PREFIX=${CMAKE_BINARY_DIR}/stage"
-      "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/InstallationPrefix"
       -DCMAKE_VERBOSE_MAKEFILE=1
   VERBATIM
   )
-add_custom_target(StagingPrefixTest ALL DEPENDS ${CMAKE_BINARY_DIR}/ConsumerProject)
-add_dependencies(StagingPrefixTest ProducerTarget)
+add_custom_target(ConsumerTarget ALL DEPENDS ${CMAKE_BINARY_DIR}/ConsumerProject)
+add_dependencies(ConsumerTarget ProducerTarget)
 set_property(
   SOURCE ${CMAKE_BINARY_DIR}/ConsumerProject
   PROPERTY SYMBOLIC 1
   )
 
 add_executable(StagingPrefix main.cpp)
-target_compile_definitions(StagingPrefix
-  PRIVATE
-    "-DMAKE_OUTPUT=\"${CMAKE_BINARY_DIR}/make_Consumer_output\""
-    "-DCOMPILER=\"${CMAKE_CXX_COMPILER}\""
-)
-add_dependencies(StagingPrefix StagingPrefixTest)
+add_dependencies(StagingPrefix ConsumerTarget)

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

Summary of changes:
 Tests/StagingPrefix/CMakeLists.txt |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake