[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2158-gf8387d7

[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  f8387d7d581702f35823c5ede1ce7d3f3002217c (commit)
       via  ccf2c9853755a9273f2d311be21da8f2c061f277 (commit)
      from  5f86bb5194a4122e1f8245ff8c5950cde9d358b5 (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=f8387d7d581702f35823c5ede1ce7d3f3002217c
commit f8387d7d581702f35823c5ede1ce7d3f3002217c
Merge: 5f86bb5 ccf2c98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 9 03:59:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 9 03:59:17 2014 -0400

    Merge topic 'install-prefix-in-interface' into next
    
    ccf2c985 Fix in-source testing.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccf2c9853755a9273f2d311be21da8f2c061f277
commit ccf2c9853755a9273f2d311be21da8f2c061f277
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 9 09:58:51 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 9 09:58:51 2014 +0200

    Fix in-source testing.

diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index eb635d1..434beb9 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -66,6 +66,11 @@ foreach(policyStatus "" NEW OLD)
     set(policyStatus WARN)
   endif()
   set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption})
+  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
+  # the test suite in-source properly.  Otherwise the install directory would be
+  # a subdirectory or the source directory, which is allowed and tested separately
+  # below.
+  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
   set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
   set(RunCMake_TEST_FILE "${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface")
   run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
@@ -73,7 +78,6 @@ foreach(policyStatus "" NEW OLD)
   unset(RunCMake_TEST_FILE)
 
   set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface")
-  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
   run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
   unset(RunCMake_TEST_SOURCE_DIR)
   unset(RunCMake_TEST_FILE)

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

Summary of changes:
 Tests/RunCMake/include_directories/RunCMakeTest.cmake |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake