[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2581-gb4aa998

[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  b4aa9984f257d28ad8020be348b5d7ba54327325 (commit)
       via  892519accf010085f7e6712464d84c06be88096d (commit)
      from  47a1c1b9930697494784e62d6440450702455fcb (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=b4aa9984f257d28ad8020be348b5d7ba54327325
commit b4aa9984f257d28ad8020be348b5d7ba54327325
Merge: 47a1c1b 892519a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 26 09:34:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 26 09:34:12 2014 -0400

    Merge topic 'file-generate-if-different' into next
    
    892519ac Fix tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=892519accf010085f7e6712464d84c06be88096d
commit 892519accf010085f7e6712464d84c06be88096d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 26 15:32:50 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Apr 26 15:32:50 2014 +0200

    Fix tests.

diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index c055af4..1f70ef4 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -13,8 +13,8 @@ set(timeformat "%Y%j%H%M%S")
 
 macro(prepare_CMP0053_test policyStatus)
   file(REMOVE "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt")
-  set(RunCMake_TEST_FILE "${RunCMake_SOURCE_DIR}/CMP0053-${policyStatus}")
-  set(RunCMake_TEST_BINARY_DIR "CMP0053-${policyStatus}-build")
+  set(RunCMake_TEST_FILE "CMP0053-${policyStatus}")
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build")
   run_cmake(CMP0053-${policyStatus}-prepare)
   unset(RunCMake_TEST_FILE)
   unset(RunCMake_TEST_BINARY_DIR)

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

Summary of changes:
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake