[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1639-g0e73b07

[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  0e73b07fd59f98447ffe3c21429ed244941d282a (commit)
       via  3cdcda702cdb050da3b637203247b18f892c4235 (commit)
      from  a5e52f0b76ff4867f4cecee63382128c89adad21 (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=0e73b07fd59f98447ffe3c21429ed244941d282a
commit 0e73b07fd59f98447ffe3c21429ed244941d282a
Merge: a5e52f0 3cdcda7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 11:21:25 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 11:21:25 2014 -0400

    Merge topic 'exclude-tests-in-install-prefix' into next
    
    3cdcda70 Tests: Exclude some tests if src is below install.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cdcda702cdb050da3b637203247b18f892c4235
commit 3cdcda702cdb050da3b637203247b18f892c4235
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 17:09:33 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 31 17:20:59 2014 +0200

    Tests: Exclude some tests if src is below install.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9bb097b..77de626 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -81,6 +81,14 @@ add_RunCMake_test(find_package)
 add_RunCMake_test(get_filename_component)
 add_RunCMake_test(if)
 add_RunCMake_test(include)
+file(RELATIVE_PATH srcRelPath ${CMAKE_INSTALL_PREFIX} ${CMAKE_SOURCE_DIR})
+if (NOT srcRelPath MATCHES "^\\.\\.")
+  list(APPEND include_directories_ARGS -DSOURCE_IN_INSTALL_PREFIX=1)
+endif()
+file(RELATIVE_PATH binRelPath ${CMAKE_INSTALL_PREFIX} ${CMAKE_BINARY_DIR})
+if (NOT binRelPath MATCHES "^\\.\\.")
+  list(APPEND include_directories_ARGS -DBUILD_IN_INSTALL_PREFIX=1)
+endif()
 add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
 add_RunCMake_test(message)
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index c00b924..8977582 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,8 +3,12 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
+if (NOT SOURCE_IN_INSTALL_PREFIX)
+  run_cmake(SourceDirectoryInInterface)
+endif()
+if (NOT BUILD_IN_INSTALL_PREFIX)
+  run_cmake(BinaryDirectoryInInterface)
+endif()
 run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
 run_cmake(RelativePathInGenex)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                         |    8 ++++++++
 Tests/RunCMake/include_directories/RunCMakeTest.cmake |    8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake