[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2018-gcea49c6
Stephen Kelly
steveire at gmail.com
Mon Apr 7 10:34:52 EDT 2014
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 cea49c6f4926dd333bc7d3436e625307183c2189 (commit)
via 4701be7646cc203ef651cfe767b71ca8f26b715a (commit)
via 5be950da9363bdd7fe3a8b2478e34e07ea0dfe39 (commit)
from d84f177e383ac027a9f8d499fb452e81ae9fb58f (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=cea49c6f4926dd333bc7d3436e625307183c2189
commit cea49c6f4926dd333bc7d3436e625307183c2189
Merge: d84f177 4701be7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 10:34:51 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 10:34:51 2014 -0400
Merge topic 'install-prefix-in-interface' into next
4701be76 Update comment.
5be950da Give this test a more appropriate name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4701be7646cc203ef651cfe767b71ca8f26b715a
commit 4701be7646cc203ef651cfe767b71ca8f26b715a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 16:34:38 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 16:34:38 2014 +0200
Update comment.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4efecf1..42fce6d 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -280,9 +280,9 @@ static bool checkInterfaceDirs(const std::string &prepro,
if (isSubDirectory(li->c_str(), installDir))
{
// The include directory is inside the install tree. If the
- // 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.
+ // install tree is not inside the source tree or build tree then
+ // fall through to the checks below that the include directory is not
+ // also inside the source tree or build tree.
bool shouldContinue =
isSubDirectory(installDir, topBinaryDir)
|| isSubDirectory(installDir, topSourceDir);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5be950da9363bdd7fe3a8b2478e34e07ea0dfe39
commit 5be950da9363bdd7fe3a8b2478e34e07ea0dfe39
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 7 16:31:31 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 7 16:33:08 2014 +0200
Give this test a more appropriate name.
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-result.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInBinDir-result.txt
rename to Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt
rename to Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
similarity index 88%
rename from Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake
rename to Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
index 1cf7088..0f08e58 100644
--- a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake
+++ b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
@@ -1,5 +1,5 @@
-project(InstallToPrefixInBinDir)
+project(InstallPrefixInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index c1a0f6c..eb635d1 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -79,8 +79,8 @@ foreach(policyStatus "" NEW OLD)
unset(RunCMake_TEST_FILE)
endforeach()
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallToPrefixInBinDir-build/prefix")
-run_cmake(InstallToPrefixInBinDir)
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
+run_cmake(InstallPrefixInInterface)
configure_file(
"${RunCMake_SOURCE_DIR}/CMakeLists.txt"
@@ -93,12 +93,12 @@ configure_file(
COPYONLY
)
configure_file(
- "${RunCMake_SOURCE_DIR}/InstallToPrefixInBinDir.cmake"
- "${RunCMake_BINARY_DIR}/installToSrc/InstallToPrefixInBinDir.cmake"
+ "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+ "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.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_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix")
+set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface")
set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
run_cmake(InstallToPrefixInSrcDirOutOfSource)
unset(RunCMake_TEST_SOURCE_DIR)
@@ -119,13 +119,13 @@ configure_file(
COPYONLY
)
configure_file(
- "${RunCMake_SOURCE_DIR}/InstallToPrefixInBinDir.cmake"
- "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallToPrefixInBinDir.cmake"
+ "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+ "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.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_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix")
+set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface")
set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
run_cmake(InstallToPrefixInSrcDirInSource)
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 6 +++---
...ult.txt => InstallPrefixInInterface-result.txt} | 0
...err.txt => InstallPrefixInInterface-stderr.txt} | 0
...BinDir.cmake => InstallPrefixInInterface.cmake} | 2 +-
.../include_directories/RunCMakeTest.cmake | 20 ++++++++++----------
5 files changed, 14 insertions(+), 14 deletions(-)
rename Tests/RunCMake/include_directories/{InstallToPrefixInBinDir-result.txt => InstallPrefixInInterface-result.txt} (100%)
rename Tests/RunCMake/include_directories/{InstallToPrefixInBinDir-stderr.txt => InstallPrefixInInterface-stderr.txt} (100%)
rename Tests/RunCMake/include_directories/{InstallToPrefixInBinDir.cmake => InstallPrefixInInterface.cmake} (88%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list