[Cmake-commits] CMake branch, next, updated. v2.8.11-2573-gc4bf1e7

[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  c4bf1e7d8f229bef6c6891793bd4460a0c285c18 (commit)
       via  1978134d8aa4c561ecbb2f4bb34c781dc58a2719 (commit)
      from  74917a66ff9a48fa79a66f3cdd648a5705adf593 (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=c4bf1e7d8f229bef6c6891793bd4460a0c285c18
commit c4bf1e7d8f229bef6c6891793bd4460a0c285c18
Merge: 74917a6 1978134
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 6 14:21:54 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 6 14:21:54 2013 -0400

    Merge topic 'INTERFACE_LINK_LIBRARIES-prop' into next
    
    1978134 Also test that install(EXPORT) works.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1978134d8aa4c561ecbb2f4bb34c781dc58a2719
commit 1978134d8aa4c561ecbb2f4bb34c781dc58a2719
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 6 20:21:16 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 6 20:21:16 2013 +0200

    Also test that install(EXPORT) works.

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index a9720e7..8109d67 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -230,11 +230,22 @@ target_link_libraries(testSharedLibDepends LINK_INTERFACE_LIBRARIES
 
 add_library(cmp0022OLD SHARED cmp0022.cpp)
 generate_export_header(cmp0022OLD BASE_NAME cmp0022)
-target_include_directories(cmp0022OLD PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>")
+target_include_directories(cmp0022OLD PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/cmp0022>"
+)
 cmake_policy(SET CMP0022 NEW)
 add_library(cmp0022NEW SHARED cmp0022.cpp)
-target_include_directories(cmp0022NEW PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>")
+target_include_directories(cmp0022NEW PUBLIC
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/cmp0022>"
+)
 cmake_policy(SET CMP0022 OLD)
+install(FILES
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmp0022.h"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmp0022_export.h"
+    DESTINATION include/cmp0022
+)
 
 set_property(TARGET testLib2 APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USING_TESTLIB2)
 set_property(TARGET testLib3 APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USING_TESTLIB3)
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 0f5806a..feb6c6c 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -73,6 +73,11 @@ target_link_libraries(cmp0022OLD_test bld_cmp0022OLD)
 add_executable(cmp0022NEW_test cmp0022NEW_test.cpp)
 target_link_libraries(cmp0022NEW_test bld_cmp0022NEW)
 
+add_executable(cmp0022OLD_exp_test cmp0022OLD_test.cpp)
+target_link_libraries(cmp0022OLD_exp_test exp_cmp0022OLD)
+add_executable(cmp0022NEW_exp_test cmp0022NEW_test.cpp)
+target_link_libraries(cmp0022NEW_exp_test exp_cmp0022NEW)
+
 # Try building a plugin to an executable imported from the build tree.
 add_library(imp_mod1b MODULE imp_mod1.c)
 target_link_libraries(imp_mod1b bld_testExe2)

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt   |   15 +++++++++++++--
 Tests/ExportImport/Import/A/CMakeLists.txt |    5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake