[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6924-g6e0c6aa

[Stephen Kelly]

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  6e0c6aae76ade61742bdce208380ce902451e87d (commit)
       via  e7a111f0945315b983cdb4d5d9f94b28e52598d4 (commit)
      from  06c69573fa02e82da195a8db054ed23f3b83f724 (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=6e0c6aae76ade61742bdce208380ce902451e87d
commit 6e0c6aae76ade61742bdce208380ce902451e87d
Merge: 06c6957 e7a111f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 14:30:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 9 14:30:14 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    e7a111f InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7a111f0945315b983cdb4d5d9f94b28e52598d4
commit e7a111f0945315b983cdb4d5d9f94b28e52598d4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 9 12:41:29 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 9 20:11:42 2014 +0100

    InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
    
    The target properties with this prefix are whitelisted for
    INTERFACE_LIBRARY targets.

diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt
index b396eb6..81b34e6 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -29,3 +29,16 @@ target_link_libraries(iface_whitelist INTERFACE $<$<BOOL:$<TARGET_PROPERTY:CUSTO
 
 add_executable(exec_whitelist dummy.cpp)
 target_link_libraries(exec_whitelist iface_whitelist)
+
+add_library(iface_imported INTERFACE IMPORTED)
+set_property(TARGET iface_imported PROPERTY
+  INTERFACE_COMPILE_DEFINITIONS
+    $<$<CONFIG:SPECIAL>:SPECIAL_MODE>
+    $<$<CONFIG:Debug>:DEBUG_MODE>
+)
+set_property(TARGET iface_imported PROPERTY
+  MAP_IMPORTED_CONFIG_DEBUG SPECIAL
+)
+
+add_executable(map_config map_config.cpp)
+target_link_libraries(map_config iface_imported)
diff --git a/Tests/InterfaceLibrary/map_config.cpp b/Tests/InterfaceLibrary/map_config.cpp
new file mode 100644
index 0000000..81bb666
--- /dev/null
+++ b/Tests/InterfaceLibrary/map_config.cpp
@@ -0,0 +1,15 @@
+
+#ifdef DEBUG_MODE
+#ifndef SPECIAL_MODE
+#error Special configuration should be mapped to debug configuration.
+#endif
+#else
+#ifdef SPECIAL_MODE
+#error Special configuration should not be enabled if not debug configuration
+#endif
+#endif
+
+int main(int,char**)
+{
+  return 0;
+}

-----------------------------------------------------------------------

Summary of changes:
 Tests/InterfaceLibrary/CMakeLists.txt |   13 +++++++++++++
 Tests/InterfaceLibrary/map_config.cpp |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 Tests/InterfaceLibrary/map_config.cpp


hooks/post-receive
-- 
CMake