[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1705-gc8ee831
Stephen Kelly
steveire at gmail.com
Tue Apr 1 09:02:23 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 c8ee8319b7b7df08da4f8b7459514d63f3cb7601 (commit)
via f24ef29e2d94f43cacdf5d1ba76fce77f075c8ca (commit)
from e0c552ed154cbd8bf68b7b24ece6b52213f4f368 (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=c8ee8319b7b7df08da4f8b7459514d63f3cb7601
commit c8ee8319b7b7df08da4f8b7459514d63f3cb7601
Merge: e0c552e f24ef29
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 09:02:22 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 09:02:22 2014 -0400
Merge topic 'install-prefix-in-interface' into next
f24ef29e Revert topic
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f24ef29e2d94f43cacdf5d1ba76fce77f075c8ca
commit f24ef29e2d94f43cacdf5d1ba76fce77f075c8ca
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 14:59:54 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 1 15:02:00 2014 +0200
Revert topic
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 81b2080..b38c48b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -277,8 +277,7 @@ static bool checkInterfaceDirs(const std::string &prepro,
" \"" << *li << "\"";
target->GetMakefile()->IssueMessage(messageType, e.str());
}
- if (isSubDirectory(li->c_str(), installDir)
- && isSubDirectory(installDir, topBinaryDir))
+ if (isSubDirectory(li->c_str(), installDir))
{
continue;
}
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 4ed2f43..ed3afc5 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -25,9 +25,7 @@ function(run_cmake test)
unset(expect_std${o})
endif()
endforeach()
- if (NOT RunCMake_TEST_SOURCE_DIR)
- set(RunCMake_TEST_SOURCE_DIR "${top_src}")
- endif()
+ set(RunCMake_TEST_SOURCE_DIR "${top_src}")
if(NOT RunCMake_TEST_BINARY_DIR)
set(RunCMake_TEST_BINARY_DIR "${top_bin}/${test}-build")
endif()
@@ -38,9 +36,6 @@ function(run_cmake test)
if(NOT DEFINED RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_OPTIONS "")
endif()
- if (NOT RunCMake_TEST_FILE)
- set(RunCMake_TEST_FILE "${test}")
- endif()
if(APPLE)
list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
endif()
@@ -57,7 +52,7 @@ function(run_cmake test)
COMMAND ${CMAKE_COMMAND} "${RunCMake_TEST_SOURCE_DIR}"
-G "${RunCMake_GENERATOR}"
-T "${RunCMake_GENERATOR_TOOLSET}"
- -DRunCMake_TEST=${RunCMake_TEST_FILE}
+ -DRunCMake_TEST=${test}
--no-warn-unused-cli
${RunCMake_TEST_OPTIONS}
WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-stderr.txt
deleted file mode 100644
index 2044b84..0000000
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
- ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-build/foo"
-
- which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix.cmake b/Tests/RunCMake/include_directories/BinInInstallPrefix.cmake
deleted file mode 100644
index bdca929..0000000
--- a/Tests/RunCMake/include_directories/BinInInstallPrefix.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-
-project(BinInInstallPrefix)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
-
-install(TARGETS testTarget EXPORT testTargets
- DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-result.txt b/Tests/RunCMake/include_directories/InstallInBinDir-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/include_directories/InstallInBinDir-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt b/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
deleted file mode 100644
index 254fae1..0000000
--- a/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
- ".*Tests/RunCMake/include_directories/InstallInBinDir-build/foo"
-
- which is prefixed in the build directory.
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
deleted file mode 100644
index 7be3044..0000000
--- a/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
- ".*Tests/RunCMake/include_directories/copy/foo"
-
- which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake b/Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake
deleted file mode 100644
index 1cf7088..0000000
--- a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-
-project(InstallToPrefixInBinDir)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
-
-install(TARGETS testTarget EXPORT testTargets
- DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index eeac0a7..c00b924 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -12,63 +12,3 @@ run_cmake(CMP0021)
run_cmake(install_config)
run_cmake(incomplete-genex)
run_cmake(export-NOWARN)
-
-configure_file(
- "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
- "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
- COPYONLY
-)
-configure_file(
- "${RunCMake_SOURCE_DIR}/empty.cpp"
- "${RunCMake_BINARY_DIR}/copy/empty.cpp"
- COPYONLY
-)
-configure_file(
- "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
- "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
- COPYONLY
-)
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix")
-set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface")
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
-run_cmake(InstallInSrcDir)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_FILE)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
-set(RunCMake_TEST_FILE "${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface")
-run_cmake(InstallInBinDir)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_FILE)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-build")
-set(RunCMake_TEST_FILE "${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface")
-run_cmake(BinInInstallPrefix)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_FILE)
-
-configure_file(
- "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
- "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
- COPYONLY
-)
-configure_file(
- "${RunCMake_SOURCE_DIR}/empty.cpp"
- "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
- COPYONLY
-)
-configure_file(
- "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
- "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
- COPYONLY
-)
-set(RunCMake_TEST_FILE "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface")
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-run_cmake(SrcInInstallPrefix)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_FILE)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallToPrefixInBinDir-build/prefix")
-run_cmake(InstallToPrefixInBinDir)
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-stderr.txt
deleted file mode 100644
index afa43e0..0000000
--- a/Tests/RunCMake/include_directories/SrcInInstallPrefix-stderr.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
-
- ".*Tests/RunCMake/include_directories/prefix/src/foo"
-
- which is prefixed in the source directory.
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInBinDir-result.txt b/Tests/RunCMake/set/PARENT_SCOPE-result.txt
similarity index 100%
rename from Tests/RunCMake/include_directories/InstallToPrefixInBinDir-result.txt
rename to Tests/RunCMake/set/PARENT_SCOPE-result.txt
diff --git a/Tests/RunCMake/set/ParentScope.cmake b/Tests/RunCMake/set/PARENT_SCOPE.cmake
similarity index 100%
rename from Tests/RunCMake/set/ParentScope.cmake
rename to Tests/RunCMake/set/PARENT_SCOPE.cmake
diff --git a/Tests/RunCMake/set/ParentScope-result.txt b/Tests/RunCMake/set/ParentScope-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/set/ParentScope-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/set/RunCMakeTest.cmake b/Tests/RunCMake/set/RunCMakeTest.cmake
index 1b51ea2..5d036e3 100644
--- a/Tests/RunCMake/set/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set/RunCMakeTest.cmake
@@ -1,3 +1,3 @@
include(RunCMake)
-run_cmake(ParentScope)
+run_cmake(PARENT_SCOPE)
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 3 +-
Tests/RunCMake/RunCMake.cmake | 9 +--
.../BinInInstallPrefix-result.txt | 1 -
.../BinInInstallPrefix-stderr.txt | 6 --
.../include_directories/BinInInstallPrefix.cmake | 11 ----
.../include_directories/InstallInBinDir-result.txt | 1 -
.../include_directories/InstallInBinDir-stderr.txt | 6 --
.../include_directories/InstallInSrcDir-result.txt | 1 -
.../include_directories/InstallInSrcDir-stderr.txt | 6 --
.../InstallToPrefixInBinDir-stderr.txt | 1 -
.../InstallToPrefixInBinDir.cmake | 11 ----
.../include_directories/RunCMakeTest.cmake | 60 --------------------
.../SrcInInstallPrefix-result.txt | 1 -
.../SrcInInstallPrefix-stderr.txt | 6 --
.../PARENT_SCOPE-result.txt} | 0
.../set/{ParentScope.cmake => PARENT_SCOPE.cmake} | 0
Tests/RunCMake/set/ParentScope-result.txt | 1 -
Tests/RunCMake/set/RunCMakeTest.cmake | 2 +-
18 files changed, 4 insertions(+), 122 deletions(-)
delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-result.txt
delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-stderr.txt
delete mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix.cmake
delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-result.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInBinDir-stderr.txt
delete mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInBinDir.cmake
delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-result.txt
delete mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-stderr.txt
rename Tests/RunCMake/{include_directories/InstallToPrefixInBinDir-result.txt => set/PARENT_SCOPE-result.txt} (100%)
rename Tests/RunCMake/set/{ParentScope.cmake => PARENT_SCOPE.cmake} (100%)
delete mode 100644 Tests/RunCMake/set/ParentScope-result.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list