diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-03 15:06:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-03 15:06:20 (GMT) |
| commit | 21c3a71eb6336ff09a6772af55d6cbc6b6a209fb (patch) | |
| tree | afe9cf3309b5e97ff2d983636504933ddbac9ef2 /Modules | |
| parent | c32ac3331f7933f6b80a2edebfcc9dc907df643f (diff) | |
| parent | 00503d387e60cd4ecda07c05bd501f5bb8df4f07 (diff) | |
| download | CMake-21c3a71eb6336ff09a6772af55d6cbc6b6a209fb.zip CMake-21c3a71eb6336ff09a6772af55d6cbc6b6a209fb.tar.gz CMake-21c3a71eb6336ff09a6772af55d6cbc6b6a209fb.tar.bz2 | |
Merge topic 'watcom-dll-no-symbols'
00503d38 Watcom: Fix creation of DLLs without any exported symbols
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-wcl386.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
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}) |