[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1641-g6f97563

[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  6f97563b0db7f51a6b59414d9750f325fdf3ec6c (commit)
       via  8ba2413e3e33a054958e2fd9d8022b084c479fcf (commit)
      from  0e73b07fd59f98447ffe3c21429ed244941d282a (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=6f97563b0db7f51a6b59414d9750f325fdf3ec6c
commit 6f97563b0db7f51a6b59414d9750f325fdf3ec6c
Merge: 0e73b07 8ba2413
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 13:02:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 13:02:37 2014 -0400

    Merge topic 'exclude-tests-in-install-prefix' into next
    
    8ba2413e Revert "Tests: Exclude some tests if src is below install."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ba2413e3e33a054958e2fd9d8022b084c479fcf
commit 8ba2413e3e33a054958e2fd9d8022b084c479fcf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 17:36:50 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 31 17:36:50 2014 +0200

    Revert "Tests: Exclude some tests if src is below install."
    
    This reverts commit 3cdcda702cdb050da3b637203247b18f892c4235.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 77de626..9bb097b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -81,14 +81,6 @@ 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 8977582..c00b924 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,12 +3,8 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
-if (NOT SOURCE_IN_INSTALL_PREFIX)
-  run_cmake(SourceDirectoryInInterface)
-endif()
-if (NOT BUILD_IN_INSTALL_PREFIX)
-  run_cmake(BinaryDirectoryInInterface)
-endif()
+run_cmake(SourceDirectoryInInterface)
+run_cmake(BinaryDirectoryInInterface)
 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, 2 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake