[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4357-gec046f4

[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  ec046f40850478b2f914650fb154688bfaaca7af (commit)
       via  9a435e716b0b7f326fbeefeec2a1c1e20d128b66 (commit)
      from  4f3b3f79bb62701b1338de22c1d99758db1d3acd (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=ec046f40850478b2f914650fb154688bfaaca7af
commit ec046f40850478b2f914650fb154688bfaaca7af
Merge: 4f3b3f7 9a435e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 30 13:00:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 30 13:00:00 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-target-type' into next
    
    9a435e7 Replace generated export headers with defines.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a435e716b0b7f326fbeefeec2a1c1e20d128b66
commit 9a435e716b0b7f326fbeefeec2a1c1e20d128b66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 30 18:58:22 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Sep 30 18:58:22 2013 +0200

    Replace generated export headers with defines.
    
    The generated headers are not used, but pic_test.h is used instead,
    which depends on the definition of PIC_TEST_BUILD_DLL.

diff --git a/Tests/PositionIndependentTargets/interface/CMakeLists.txt b/Tests/PositionIndependentTargets/interface/CMakeLists.txt
index 8595ffc..65f3b76 100644
--- a/Tests/PositionIndependentTargets/interface/CMakeLists.txt
+++ b/Tests/PositionIndependentTargets/interface/CMakeLists.txt
@@ -5,18 +5,16 @@ set_property(TARGET piciface PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE ON)
 add_executable(test_empty_iface "${CMAKE_CURRENT_SOURCE_DIR}/../pic_main.cpp")
 target_link_libraries(test_empty_iface piciface)
 
-include(GenerateExportHeader)
-
 add_library(sharedlib SHARED "${CMAKE_CURRENT_SOURCE_DIR}/../pic_lib.cpp")
 target_link_libraries(sharedlib piciface)
-generate_export_header(sharedlib)
+set_property(TARGET sharedlib PROPERTY DEFINE_SYMBOL PIC_TEST_BUILD_DLL)
 
 add_executable(test_iface_via_shared "${CMAKE_CURRENT_SOURCE_DIR}/../pic_main.cpp")
 target_link_libraries(test_iface_via_shared sharedlib)
 
 add_library(sharedlibpic SHARED "${CMAKE_CURRENT_SOURCE_DIR}/../pic_lib.cpp")
 set_property(TARGET sharedlibpic PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE ON)
-generate_export_header(sharedlibpic)
+set_property(TARGET sharedlibpic PROPERTY DEFINE_SYMBOL PIC_TEST_BUILD_DLL)
 
 add_library(shared_iface INTERFACE)
 target_link_libraries(shared_iface INTERFACE sharedlibpic)

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

Summary of changes:
 .../interface/CMakeLists.txt                       |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake