[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2573-gc67496e

[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  c67496e058b5664da062e85522c3571252ba5025 (commit)
       via  a887a7f3d9024b318c6b34f335b7daad33558543 (commit)
      from  30b80385d358fa8296839f5ce3b1fca572fc5bd6 (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=c67496e058b5664da062e85522c3571252ba5025
commit c67496e058b5664da062e85522c3571252ba5025
Merge: 30b8038 a887a7f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Apr 26 08:25:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Apr 26 08:25:50 2014 -0400

    Merge topic 'file-generate-if-different' into next
    
    a887a7f3 Fix test.


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

    Fix test.

diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index dd1cfce..c055af4 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -14,7 +14,7 @@ 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 "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build")
+  set(RunCMake_TEST_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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake