[Cmake-commits] CMake branch, next, updated. v3.5.1-653-g2632c2f
Brad King
brad.king at kitware.com
Fri Mar 25 09:21:23 EDT 2016
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 2632c2fdd29797357b76e0a33b2b0759801e6928 (commit)
via c41b9dc7b5d9e38ec89c5865ee7a8d6409ad4dea (commit)
via 484d7ca0e0660f3a5573e83c917f8a7dc6c4e183 (commit)
from fed393454c55d27d972862be9f5e2df8c0a35220 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2632c2fdd29797357b76e0a33b2b0759801e6928
commit 2632c2fdd29797357b76e0a33b2b0759801e6928
Merge: fed3934 c41b9dc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 25 09:21:22 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 25 09:21:22 2016 -0400
Merge topic 'test-fix-FindGTK2-cxx11' into next
c41b9dc7 Tests: Fix GTK2Components.gtkmm test with sigc++ >= 2.5.1
484d7ca0 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c41b9dc7b5d9e38ec89c5865ee7a8d6409ad4dea
commit c41b9dc7b5d9e38ec89c5865ee7a8d6409ad4dea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 25 09:19:33 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 25 09:19:33 2016 -0400
Tests: Fix GTK2Components.gtkmm test with sigc++ >= 2.5.1
FindGTK2 adds compile features to GTK2::sigc++ so that clients will
compile as C++11 or above. However, our test case covers using just the
library list variables instead of the imported targets. Fix this case
by propagating the compile features manually.
diff --git a/Tests/FindGTK2/gtkmm/CMakeLists.txt b/Tests/FindGTK2/gtkmm/CMakeLists.txt
index 32aafe2..eb0b7aa 100644
--- a/Tests/FindGTK2/gtkmm/CMakeLists.txt
+++ b/Tests/FindGTK2/gtkmm/CMakeLists.txt
@@ -12,3 +12,8 @@ target_link_libraries(gtkmm-target GTK2::gtkmm)
add_executable(gtkmm-all-libs WIN32 main.cpp helloworld.cpp helloworld.h)
target_link_libraries(gtkmm-all-libs ${GTK2_LIBRARIES})
target_include_directories(gtkmm-all-libs PRIVATE ${GTK2_INCLUDE_DIRS})
+
+# Linking via the library variables does not cause compile feature
+# requirements to propagate. Do it manually for purposes of this test.
+get_property(features TARGET GTK2::sigc++ PROPERTY INTERFACE_COMPILE_FEATURES)
+set_property(TARGET gtkmm-all-libs PROPERTY COMPILE_FEATURES ${features})
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Tests/FindGTK2/gtkmm/CMakeLists.txt | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list