[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1560-g1ca019c

[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  1ca019c875ceb911bca19636647186cd073e1113 (commit)
       via  0de21a3be088abe12c36e2a4f46595b61dd8e351 (commit)
      from  13146046f0bf96f8b90bdfe79affd139ac40938a (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=1ca019c875ceb911bca19636647186cd073e1113
commit 1ca019c875ceb911bca19636647186cd073e1113
Merge: 1314604 0de21a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 11 18:03:23 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 11 18:03:23 2013 -0500

    Merge topic 'test-export-iface-genex' into next
    
    0de21a3 Add a test for the interfaces in targets exported from the build tree.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0de21a3be088abe12c36e2a4f46595b61dd8e351
commit 0de21a3be088abe12c36e2a4f46595b61dd8e351
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 12 00:00:42 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 12 00:00:42 2013 +0100

    Add a test for the interfaces in targets exported from the build tree.

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 779d889..4f6ccd6 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -250,6 +250,7 @@ endif()
 # Export from build tree.
 export(TARGETS testExe1 testLib1 testLib2 testLib3
   testExe2libImp testLib3Imp testLib3ImpDep
+  testSharedLibRequired testSharedLibDepends
   NAMESPACE bld_
   FILE ExportBuildTree.cmake
   )
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index abb2ab0..6a2e54c 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -159,22 +159,19 @@ endif()
 
 add_executable(deps_iface deps_iface.c)
 target_link_libraries(deps_iface testLibDepends)
-set_property(TARGET deps_iface APPEND PROPERTY
-  COMPILE_DEFINITIONS
-    $<TARGET_PROPERTY:testLibDepends,INTERFACE_COMPILE_DEFINITIONS>
-)
-set_property(TARGET deps_iface APPEND PROPERTY
-  INCLUDE_DIRECTORIES
-    $<TARGET_PROPERTY:testLibDepends,INTERFACE_INCLUDE_DIRECTORIES>
-)
+target_include_directories(deps_iface PRIVATE testLibDepends)
+target_compile_definitions(deps_iface PRIVATE testLibDepends)
 
 add_executable(deps_shared_iface deps_shared_iface.cpp)
 target_link_libraries(deps_shared_iface testSharedLibDepends)
-set_property(TARGET deps_shared_iface APPEND PROPERTY
-  COMPILE_DEFINITIONS
-    $<TARGET_PROPERTY:testSharedLibDepends,INTERFACE_COMPILE_DEFINITIONS>
-)
-set_property(TARGET deps_shared_iface APPEND PROPERTY
-  INCLUDE_DIRECTORIES
-    $<TARGET_PROPERTY:testSharedLibDepends,INTERFACE_INCLUDE_DIRECTORIES>
-)
+target_include_directories(deps_shared_iface PRIVATE testSharedLibDepends)
+target_compile_definitions(deps_shared_iface PRIVATE testSharedLibDepends)
+
+#-----------------------------------------------------------------------------
+# Test that targets imported from the build tree have their dependencies
+# evaluated correctly. The above already tests the same for the install tree.
+
+add_executable(deps_shared_iface2 deps_shared_iface.cpp)
+target_link_libraries(deps_shared_iface2 bld_testSharedLibDepends)
+target_include_directories(deps_shared_iface2 PRIVATE bld_testSharedLibDepends)
+target_compile_definitions(deps_shared_iface2 PRIVATE bld_testSharedLibDepends)

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt   |    1 +
 Tests/ExportImport/Import/A/CMakeLists.txt |   29 ++++++++++++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake