[Cmake-commits] CMake branch, next, updated. v2.8.10.1-996-g49ba670
Stephen Kelly
steveire at gmail.com
Fri Nov 23 12:30:25 EST 2012
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 49ba670b61f2e8438b33fe6667d9c50da2a8d556 (commit)
via 925889a3c59ff14679a859e0cf21407d9aa3bf22 (commit)
from df18a575cf3dabf82bedbbe67fee2b84e481345f (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=49ba670b61f2e8438b33fe6667d9c50da2a8d556
commit 49ba670b61f2e8438b33fe6667d9c50da2a8d556
Merge: df18a57 925889a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 23 12:30:20 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 23 12:30:20 2012 -0500
Merge topic 'tll-set-include-and-defines-requirements' into next
925889a Remove the CMP0019 test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=925889a3c59ff14679a859e0cf21407d9aa3bf22
commit 925889a3c59ff14679a859e0cf21407d9aa3bf22
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 23 18:28:16 2012 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 23 18:28:16 2012 +0100
Remove the CMP0019 test
It is not reliable, and it is not useful. The NEW and OLD tests do not
test that the warning message is not printed. The actual functionality
introduced with the policy is tested by the target_link_libraries test.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9010aa1..722d9c3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -56,9 +56,6 @@ add_RunCMake_test(include)
add_RunCMake_test(include_directories)
add_RunCMake_test(list)
add_RunCMake_test(load_command)
-if (POLICY CMP0019)
- add_RunCMake_test(PolicyCMP0019)
-endif()
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
add_RunCMake_test(include_external_msproject)
diff --git a/Tests/RunCMake/PolicyCMP0019/CMakeLists.txt b/Tests/RunCMake/PolicyCMP0019/CMakeLists.txt
deleted file mode 100644
index 22b4721..0000000
--- a/Tests/RunCMake/PolicyCMP0019/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8)
-project(${RunCMake_TEST} CXX)
-
-# MSVC creates extra targets which pollute the stderr unless we set this.
-set(CMAKE_SUPPRESS_REGENERATION TRUE)
-
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyNew1-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyNew1-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyNew1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyNew1-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyNew1-stderr.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyNew1.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyNew1.cmake
deleted file mode 100644
index f71d84c..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyNew1.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-cmake_policy(SET CMP0019 NEW)
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY LINK_INTERFACE_LIBRARIES blub)
-set_property(TARGET bar APPEND PROPERTY INTERFACE_LINK_LIBRARIES blah)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld1-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyOld1-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyOld1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld1-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyOld1-stderr.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld1.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyOld1.cmake
deleted file mode 100644
index cef458e..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyOld1.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-# cmake_policy(SET CMP0019 OLD)
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY LINK_INTERFACE_LIBRARIES blub)
-set_property(TARGET bar APPEND PROPERTY INTERFACE_LINK_LIBRARIES blah)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld2-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyOld2-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyOld2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld2-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyOld2-stderr.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyOld2.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyOld2.cmake
deleted file mode 100644
index 36a8bbc..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyOld2.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY LINK_INTERFACE_LIBRARIES blub)
-set_property(TARGET bar APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<1:blub>)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-stderr.txt
deleted file mode 100644
index fd6684f..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1-stderr.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CMake Warning \(dev\) in CMakeLists.txt:
- The INTERFACE_LINK_LIBRARIES and LINK_INTERFACE_LIBRARIES are not the same
- for target \"bar\".
-
- NEW content is \"\$<EXPORT_NAMESPACE>foo\"
-
- OLD content is \"foo;blub\"
-
- Policy CMP0019 is not set: Use INTERFACE_LINK_LIBRARIES instead of
- LINK_INTERFACE_LIBRARIES. Run "cmake --help-policy CMP0019" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyWarn1.cmake
deleted file mode 100644
index 9157fd4..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn1.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY LINK_INTERFACE_LIBRARIES blub)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-stderr.txt
deleted file mode 100644
index fe02015..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2-stderr.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CMake Warning \(dev\) in CMakeLists.txt:
- The INTERFACE_LINK_LIBRARIES and LINK_INTERFACE_LIBRARIES are not the same
- for target \"bar\".
-
- NEW content is \"\$<EXPORT_NAMESPACE>foo;\$<0:blub>\"
-
- OLD content is \"foo;blub\"
-
- Policy CMP0019 is not set: Use INTERFACE_LINK_LIBRARIES instead of
- LINK_INTERFACE_LIBRARIES. Run "cmake --help-policy CMP0019" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyWarn2.cmake
deleted file mode 100644
index 37fde31..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn2.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY LINK_INTERFACE_LIBRARIES blub)
-set_property(TARGET bar APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<0:blub>)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-result.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-stderr.txt b/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-stderr.txt
deleted file mode 100644
index 366a452..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3-stderr.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CMake Warning \(dev\) in CMakeLists.txt:
- The INTERFACE_LINK_LIBRARIES and LINK_INTERFACE_LIBRARIES are not the same
- for target \"bar\".
-
- NEW content is \"\$<EXPORT_NAMESPACE>foo;blub\"
-
- OLD content is \"foo\"
-
- Policy CMP0019 is not set: Use INTERFACE_LINK_LIBRARIES instead of
- LINK_INTERFACE_LIBRARIES. Run "cmake --help-policy CMP0019" for policy
- details. Use the cmake_policy command to set the policy and suppress this
- warning.
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3.cmake b/Tests/RunCMake/PolicyCMP0019/PolicyWarn3.cmake
deleted file mode 100644
index 773baf4..0000000
--- a/Tests/RunCMake/PolicyCMP0019/PolicyWarn3.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-
-add_library(foo SHARED "libfoo.cpp")
-
-add_library(bar SHARED "libbar.cpp")
-target_link_libraries(bar LINK_INTERFACE_LIBRARIES foo)
-set_property(TARGET bar APPEND PROPERTY INTERFACE_LINK_LIBRARIES blub)
-
-add_executable(testexe "main.cpp")
-target_link_libraries(testexe bar)
diff --git a/Tests/RunCMake/PolicyCMP0019/RunCMakeTest.cmake b/Tests/RunCMake/PolicyCMP0019/RunCMakeTest.cmake
deleted file mode 100644
index 2fea3a4..0000000
--- a/Tests/RunCMake/PolicyCMP0019/RunCMakeTest.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-include(RunCMake)
-
-run_cmake(PolicyOld1)
-run_cmake(PolicyOld2)
-run_cmake(PolicyWarn1)
-run_cmake(PolicyWarn2)
-run_cmake(PolicyWarn3)
-run_cmake(PolicyNew1)
diff --git a/Tests/RunCMake/PolicyCMP0019/libbar.cpp b/Tests/RunCMake/PolicyCMP0019/libbar.cpp
deleted file mode 100644
index 8331804..0000000
--- a/Tests/RunCMake/PolicyCMP0019/libbar.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-enum { two };
diff --git a/Tests/RunCMake/PolicyCMP0019/libfoo.cpp b/Tests/RunCMake/PolicyCMP0019/libfoo.cpp
deleted file mode 100644
index 08e0dd4..0000000
--- a/Tests/RunCMake/PolicyCMP0019/libfoo.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-enum { one };
diff --git a/Tests/RunCMake/PolicyCMP0019/main.cpp b/Tests/RunCMake/PolicyCMP0019/main.cpp
deleted file mode 100644
index e9ad257..0000000
--- a/Tests/RunCMake/PolicyCMP0019/main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-int main(int, char**)
-{
- return 0;
-}
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 3 ---
Tests/RunCMake/PolicyCMP0019/CMakeLists.txt | 8 --------
Tests/RunCMake/PolicyCMP0019/PolicyNew1-result.txt | 1 -
Tests/RunCMake/PolicyCMP0019/PolicyNew1.cmake | 12 ------------
Tests/RunCMake/PolicyCMP0019/PolicyOld1-result.txt | 1 -
Tests/RunCMake/PolicyCMP0019/PolicyOld1.cmake | 12 ------------
Tests/RunCMake/PolicyCMP0019/PolicyOld2-result.txt | 1 -
Tests/RunCMake/PolicyCMP0019/PolicyOld2.cmake | 10 ----------
.../RunCMake/PolicyCMP0019/PolicyWarn1-result.txt | 1 -
.../RunCMake/PolicyCMP0019/PolicyWarn1-stderr.txt | 13 -------------
Tests/RunCMake/PolicyCMP0019/PolicyWarn1.cmake | 9 ---------
.../RunCMake/PolicyCMP0019/PolicyWarn2-result.txt | 1 -
.../RunCMake/PolicyCMP0019/PolicyWarn2-stderr.txt | 13 -------------
Tests/RunCMake/PolicyCMP0019/PolicyWarn2.cmake | 10 ----------
.../RunCMake/PolicyCMP0019/PolicyWarn3-result.txt | 1 -
.../RunCMake/PolicyCMP0019/PolicyWarn3-stderr.txt | 13 -------------
Tests/RunCMake/PolicyCMP0019/PolicyWarn3.cmake | 9 ---------
Tests/RunCMake/PolicyCMP0019/RunCMakeTest.cmake | 8 --------
Tests/RunCMake/PolicyCMP0019/libbar.cpp | 2 --
Tests/RunCMake/PolicyCMP0019/libfoo.cpp | 2 --
Tests/RunCMake/PolicyCMP0019/main.cpp | 5 -----
21 files changed, 0 insertions(+), 135 deletions(-)
delete mode 100644 Tests/RunCMake/PolicyCMP0019/CMakeLists.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyNew1-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyNew1-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyNew1.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld1-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld1-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld1.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld2-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld2-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyOld2.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn1-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn1-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn1.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn2-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn2-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn2.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn3-result.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn3-stderr.txt
delete mode 100644 Tests/RunCMake/PolicyCMP0019/PolicyWarn3.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/PolicyCMP0019/libbar.cpp
delete mode 100644 Tests/RunCMake/PolicyCMP0019/libfoo.cpp
delete mode 100644 Tests/RunCMake/PolicyCMP0019/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list