[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3176-gb05ba6b

[Brad King]

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  b05ba6b8bae8eaad85d1a321ae796fec703e85dd (commit)
       via  295a42c96cc98585530c105d3b59a01be7187f9f (commit)
      from  bd913528b7df29989b3ceae23ed6b64d0951fdbb (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=b05ba6b8bae8eaad85d1a321ae796fec703e85dd
commit b05ba6b8bae8eaad85d1a321ae796fec703e85dd
Merge: bd91352 295a42c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 16 14:16:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 16 14:16:43 2013 -0400

    Merge topic 'INTERFACE_LINK_LIBRARIES-prop' into next
    
    295a42c Fix ExportImport test cmp0022NEW build on Watcom


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=295a42c96cc98585530c105d3b59a01be7187f9f
commit 295a42c96cc98585530c105d3b59a01be7187f9f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 16 14:08:50 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 16 14:08:50 2013 -0400

    Fix ExportImport test cmp0022NEW build on Watcom
    
    The test uses generate_export_header(cmp0022OLD ...) to generate the
    cmp0022_export.h header used by both cmp0022OLD and cmp0022NEW.  In
    the latter the _EXPORTS symbol does not match what the header expects
    so the library does not export anything.  The Watcom linker does not
    like to create shared libraries that do not export any symbols.
    
    Fix this by setting the DEFINE_SYMBOL property on cmp0022NEW to match
    that of cmp0022OLD as the header expects.

diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index da15d62..000e350 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -240,6 +240,7 @@ target_include_directories(cmp0022OLD PUBLIC
 )
 cmake_policy(SET CMP0022 NEW)
 add_library(cmp0022NEW SHARED cmp0022_vs6_1.cpp)
+set_property(TARGET cmp0022NEW PROPERTY DEFINE_SYMBOL cmp0022OLD_EXPORTS)
 target_include_directories(cmp0022NEW PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>"
   "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/cmp0022>"

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

Summary of changes:
 Tests/ExportImport/Export/CMakeLists.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake