[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1358-gdbf9485
Stephen Kelly
steveire at gmail.com
Thu Mar 20 19:52:40 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 dbf948538c136b1cd4df6142fad1b80067380b29 (commit)
via 9dcdb32035d3f656ffd83db7f53d83b10e59b9f8 (commit)
from be51df2412f0fc85b3407f105d440d8be09783d5 (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=dbf948538c136b1cd4df6142fad1b80067380b29
commit dbf948538c136b1cd4df6142fad1b80067380b29
Merge: be51df2 9dcdb32
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 19:52:38 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 19:52:38 2014 -0400
Merge topic 'target-sources-refactor' into next
9dcdb320 Add CMP0051 tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dcdb32035d3f656ffd83db7f53d83b10e59b9f8
commit 9dcdb32035d3f656ffd83db7f53d83b10e59b9f8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Mar 21 00:49:03 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Mar 21 00:51:57 2014 +0100
Add CMP0051 tests.
diff --git a/Tests/RunCMake/CMP0051/CMP0051-NEW-result.txt b/Tests/RunCMake/CMP0051/CMP0051-NEW-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-NEW-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0051/CMP0051-NEW-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-NEW-stderr.txt
new file mode 100644
index 0000000..e5578ba
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-NEW-stderr.txt
@@ -0,0 +1 @@
+^Sources: "empty.cpp;\$<TARGET_OBJECTS:objects>"$
diff --git a/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake b/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake
new file mode 100644
index 0000000..f304bf1
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-NEW.cmake
@@ -0,0 +1,10 @@
+
+cmake_policy(SET CMP0051 NEW)
+
+add_library(objects OBJECT empty.cpp)
+
+add_library(empty empty.cpp $<TARGET_OBJECTS:objects>)
+
+get_target_property(srcs empty SOURCES)
+
+message("Sources: \"${srcs}\"")
diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt b/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt
new file mode 100644
index 0000000..cc17f33
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt
@@ -0,0 +1 @@
+^Sources: "empty.cpp"$
diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake b/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake
new file mode 100644
index 0000000..0243e94
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-OLD.cmake
@@ -0,0 +1,10 @@
+
+cmake_policy(SET CMP0051 OLD)
+
+add_library(objects OBJECT empty.cpp)
+
+add_library(empty empty.cpp $<TARGET_OBJECTS:objects>)
+
+get_target_property(srcs empty SOURCES)
+
+message("Sources: \"${srcs}\"")
diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt b/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-WARN-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt
new file mode 100644
index 0000000..f1b0357
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt
@@ -0,0 +1,15 @@
+CMake Warning \(dev\) at CMP0051-WARN.cmake:6 \(get_target_property\):
+ Policy CMP0051 is not set: List TARGET_OBJECTS in SOURCES target property.
+ Run "cmake --help-policy CMP0051" for policy details. Use the cmake_policy
+ command to set the policy and suppress this warning.
+
+ Target "empty" contains \$<TARGET_OBJECTS> generator expression in its
+ sources list. This content was not previously part of the SOURCES property
+ when that property was read at configure time. Code reading that property
+ needs to be adapted to ignore the generator expression using the
+ string\(GENEX_STRIP\) command.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+Sources: "empty.cpp"$
diff --git a/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake b/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake
new file mode 100644
index 0000000..fd595ce
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMP0051-WARN.cmake
@@ -0,0 +1,8 @@
+
+add_library(objects OBJECT empty.cpp)
+
+add_library(empty empty.cpp $<TARGET_OBJECTS:objects>)
+
+get_target_property(srcs empty SOURCES)
+
+message("Sources: \"${srcs}\"")
diff --git a/Tests/RunCMake/CMP0051/CMakeLists.txt b/Tests/RunCMake/CMP0051/CMakeLists.txt
new file mode 100644
index 0000000..a06591c
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(${RunCMake_TEST} CXX)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0051/RunCMakeTest.cmake b/Tests/RunCMake/CMP0051/RunCMakeTest.cmake
new file mode 100644
index 0000000..621192d
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+run_cmake(CMP0051-OLD)
+run_cmake(CMP0051-NEW)
+run_cmake(CMP0051-WARN)
diff --git a/Tests/RunCMake/CMP0051/empty.cpp b/Tests/RunCMake/CMP0051/empty.cpp
new file mode 100644
index 0000000..bfbbdde
--- /dev/null
+++ b/Tests/RunCMake/CMP0051/empty.cpp
@@ -0,0 +1,7 @@
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int empty()
+{
+ return 0;
+}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 658aed3..34f9914 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -34,6 +34,7 @@ add_RunCMake_test(CMP0045)
add_RunCMake_test(CMP0046)
add_RunCMake_test(CMP0049)
add_RunCMake_test(CMP0050)
+add_RunCMake_test(CMP0051)
add_RunCMake_test(CTest)
if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
add_RunCMake_test(CompilerChange)
-----------------------------------------------------------------------
Summary of changes:
.../CMP0051-NEW-result.txt} | 0
Tests/RunCMake/CMP0051/CMP0051-NEW-stderr.txt | 1 +
Tests/RunCMake/CMP0051/CMP0051-NEW.cmake | 10 ++++++++++
.../CMP0051-OLD-result.txt} | 0
Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt | 1 +
Tests/RunCMake/CMP0051/CMP0051-OLD.cmake | 10 ++++++++++
.../CMP0051-WARN-result.txt} | 0
Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt | 15 +++++++++++++++
Tests/RunCMake/CMP0051/CMP0051-WARN.cmake | 8 ++++++++
Tests/RunCMake/{CMP0038 => CMP0051}/CMakeLists.txt | 0
Tests/RunCMake/CMP0051/RunCMakeTest.cmake | 5 +++++
Tests/RunCMake/{CMP0022 => CMP0051}/empty.cpp | 0
Tests/RunCMake/CMakeLists.txt | 1 +
13 files changed, 51 insertions(+)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0051/CMP0051-NEW-result.txt} (100%)
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-NEW-stderr.txt
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-NEW.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0051/CMP0051-OLD-result.txt} (100%)
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-OLD.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0051/CMP0051-WARN-result.txt} (100%)
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN-stderr.txt
create mode 100644 Tests/RunCMake/CMP0051/CMP0051-WARN.cmake
copy Tests/RunCMake/{CMP0038 => CMP0051}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/CMP0051/RunCMakeTest.cmake
copy Tests/RunCMake/{CMP0022 => CMP0051}/empty.cpp (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list