[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-422-g4d73673

[Domen Vrankar]

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  4d73673ff03d1f60314eac2fde5db6483db2de1c (commit)
       via  0bc9f68549ca9d8420e93b1aac0ca88478cf276d (commit)
      from  044833f9862b3c5657aff6d5e939f6e1c6cef8ed (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=4d73673ff03d1f60314eac2fde5db6483db2de1c
commit 4d73673ff03d1f60314eac2fde5db6483db2de1c
Merge: 044833f 0bc9f68
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jun 10 16:16:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 10 16:16:08 2015 -0400

    Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next
    
    0bc9f685 fixup! CPack Deb and RPM RunCMake tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bc9f68549ca9d8420e93b1aac0ca88478cf276d
commit 0bc9f68549ca9d8420e93b1aac0ca88478cf276d
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jun 10 22:15:36 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Jun 10 22:15:36 2015 +0200

    fixup! CPack Deb and RPM RunCMake tests
    
    Test was deleting source dir if cmake
    was built in-place.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 43df312..74bbf38 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -28,9 +28,9 @@ endmacro()
 
 function(add_RunCMake_test_group test types)
   # create directory for common content
-  set(BASE_TEST_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${test}")
-  file(REMOVE_RECURSE "${BASE_TEST_BINARY_DIR}")
-  file(MAKE_DIRECTORY "${BASE_TEST_BINARY_DIR}")
+  set(TEST_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/${test}/conf")
+  file(REMOVE_RECURSE "${TEST_CONFIG_DIR}")
+  file(MAKE_DIRECTORY "${TEST_CONFIG_DIR}")
 
   foreach(type IN LISTS types)
     # generate prerequirements config file in cmake as ctest doesn't have as
@@ -39,7 +39,7 @@ function(add_RunCMake_test_group test types)
     unset(${test}_${type}_FOUND_PREREQUIREMENTS)
     include("${CMAKE_CURRENT_SOURCE_DIR}/${test}/${type}/Prerequirements.cmake")
     get_test_prerequirements("${test}_${type}_FOUND_PREREQUIREMENTS"
-        "${BASE_TEST_BINARY_DIR}/${type}_config.cmake")
+        "${TEST_CONFIG_DIR}/${type}_config.cmake")
 
     # only add the test if prerequirements are met
     if(${test}_${type}_FOUND_PREREQUIREMENTS)
@@ -52,7 +52,7 @@ function(add_RunCMake_test_group test types)
         -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
         -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
         -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${type}/${test}
-        -Dconfig_file=${BASE_TEST_BINARY_DIR}/${type}_config.cmake
+        -Dconfig_file=${TEST_CONFIG_DIR}/${type}_config.cmake
         -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
         )
     endif()

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake