[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1837-g2904bdd

[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  2904bdd55dd3014afea894caa91cca89e8c4bfee (commit)
       via  00503d387e60cd4ecda07c05bd501f5bb8df4f07 (commit)
      from  e996c49106589dc090a399b382cc3b034e146141 (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=2904bdd55dd3014afea894caa91cca89e8c4bfee
commit 2904bdd55dd3014afea894caa91cca89e8c4bfee
Merge: e996c49 00503d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 28 09:09:06 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 09:09:06 2014 -0500

    Merge topic 'watcom-dll-no-symbols' into next
    
    00503d38 Watcom: Fix creation of DLLs without any exported symbols


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00503d387e60cd4ecda07c05bd501f5bb8df4f07
commit 00503d387e60cd4ecda07c05bd501f5bb8df4f07
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 27 16:22:28 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 27 16:22:28 2014 -0500

    Watcom: Fix creation of DLLs without any exported symbols
    
    Create each DLL import library by passing "option implib=..." to the
    linker for its SHARED library.  This works even when there are no
    symbols to be exported.  Leave the option out for MODULE libraries
    because we do not need an import library for them.  For executables,
    retain the separate invocation of wlib because we want an import
    library only when the ENABLE_EXPORTS property is set, and in that
    case the project should provide symbols.
    
    Suggested-by: J Decker <d3ck0r at gmail.com>

diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index 8a03b29..d61ea47 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -65,11 +65,10 @@ set(CMAKE_C_CREATE_PREPROCESSED_SOURCE
 set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE
     "<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_WCL_QUIET} <FLAGS> -dWIN32 -d+ <DEFINES> -fo<PREPROCESSED_SOURCE> -pl -cc++ <SOURCE>${CMAKE_END_TEMP_FILE}")
 
-set(CMAKE_CXX_CREATE_SHARED_MODULE
- "wlink ${CMAKE_START_TEMP_FILE} system nt_dll  ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' <LINK_FLAGS> option caseexact  file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
 set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  ${CMAKE_CXX_CREATE_SHARED_MODULE}
-  ${CMAKE_CXX_CREATE_IMPORT_LIBRARY})
+ "wlink ${CMAKE_START_TEMP_FILE} system nt_dll  ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' <LINK_FLAGS> option implib=<TARGET_IMPLIB> option caseexact  file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
+string(REPLACE " option implib=<TARGET_IMPLIB>" ""
+  CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
 
 # create a C shared library
 set(CMAKE_C_CREATE_SHARED_LIBRARY ${CMAKE_CXX_CREATE_SHARED_LIBRARY})

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

Summary of changes:
 Modules/Platform/Windows-wcl386.cmake |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake