[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2013-g0752e0e

[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  0752e0ef50d055f001734c874fcf01d4b9cb1482 (commit)
       via  17cb943bd030b11fe767a4bc10d99a3ce72e9918 (commit)
      from  2d3e43a2653623dfd7d13d1df0df498cb389c1fc (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=0752e0ef50d055f001734c874fcf01d4b9cb1482
commit 0752e0ef50d055f001734c874fcf01d4b9cb1482
Merge: 2d3e43a 17cb943
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 10:26:56 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 10:26:56 2014 -0400

    Merge topic 'install-prefix-in-interface' into next
    
    17cb943b Allow installation to srcdir from external build dir.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17cb943bd030b11fe767a4bc10d99a3ce72e9918
commit 17cb943bd030b11fe767a4bc10d99a3ce72e9918
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 16:22:37 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 16:22:37 2014 +0200

    Allow installation to srcdir from external build dir.
    
    Test that case, and the in-src build install to src case.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index d25454d..4efecf1 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -283,7 +283,10 @@ static bool checkInterfaceDirs(const std::string &prepro,
       // install tree is not inside the build tree then fall through
       // to the checks below that the include directory is not also
       // inside the build tree.
-      bool shouldContinue = isSubDirectory(installDir, topBinaryDir);
+      bool shouldContinue =
+          isSubDirectory(installDir, topBinaryDir)
+        || isSubDirectory(installDir, topSourceDir);
+
       if (!shouldContinue)
         {
         switch(target->GetPolicyStatusCMP0052())
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index b88a636..c1a0f6c 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -81,3 +81,55 @@ endforeach()
 
 set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallToPrefixInBinDir-build/prefix")
 run_cmake(InstallToPrefixInBinDir)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallToPrefixInBinDir.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrc/InstallToPrefixInBinDir.cmake"
+  COPYONLY
+)
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallToPrefixInBinDir/prefix")
+set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/installToSrc/InstallToPrefixInBinDir")
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
+run_cmake(InstallToPrefixInSrcDirOutOfSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+unset(RunCMake_TEST_FILE)
+
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_NO_CLEAN ON)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallToPrefixInBinDir.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallToPrefixInBinDir.cmake"
+  COPYONLY
+)
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallToPrefixInBinDir/prefix")
+set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallToPrefixInBinDir")
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+run_cmake(InstallToPrefixInSrcDirInSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+unset(RunCMake_TEST_BINARY_DIR)
+unset(RunCMake_TEST_FILE)
+unset(RunCMake_TEST_NO_CLEAN)

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

Summary of changes:
 Source/cmExportFileGenerator.cxx                   |    5 +-
 .../include_directories/RunCMakeTest.cmake         |   52 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake