From 42e1ffb7f5ef5c8a570e08f4a587f34458172325 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 3 Mar 2007 10:09:18 -0500 Subject: BUG: Do not create import library for MODULEs. The TARGET_IMPLIB name is not set correctly for MODULE rules anyway. --- Modules/Platform/Windows-bcc32.cmake | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Modules/Platform/Windows-bcc32.cmake b/Modules/Platform/Windows-bcc32.cmake index 3bc4f01..d921cb4 100644 --- a/Modules/Platform/Windows-bcc32.cmake +++ b/Modules/Platform/Windows-bcc32.cmake @@ -26,23 +26,27 @@ SET(CMAKE_FIND_LIBRARY_SUFFIXES "-bcc.lib" ".lib") # Borland cannot handle + in the file name, so mangle object file name SET (CMAKE_MANGLE_OBJECT_FILE_NAMES "ON") -# create a shared C++ library -SET(CMAKE_CXX_CREATE_SHARED_LIBRARY +# Create a C++ module library. +SET(CMAKE_CXX_CREATE_SHARED_MODULE " ${CMAKE_START_TEMP_FILE}-e -tWD -tWR ${CMAKE_END_TEMP_FILE}" - "implib -c -w " ) -SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) +# Create a C++ shared library. +# First create a module and then its import library. +SET(CMAKE_CXX_CREATE_SHARED_LIBRARY ${CMAKE_CXX_CREATE_SHARED_MODULE} + "implib -c -w " + ) -# create a C shared library -SET(CMAKE_C_CREATE_SHARED_LIBRARY +# Create a C module library. +SET(CMAKE_C_CREATE_SHARED_MODULE " ${CMAKE_START_TEMP_FILE}-e -tWD -tWR ${CMAKE_END_TEMP_FILE}" - "implib -c -w " ) -# create a C shared module just copy the shared library rule -SET(CMAKE_C_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_LIBRARY}) - +# Create a C shared library. +# First create a module and then its import library. +SET(CMAKE_C_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_MODULE} + "implib -c -w " + ) # create a C++ static library SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "tlib ${CMAKE_START_TEMP_FILE}/p512 /a ${CMAKE_END_TEMP_FILE}") -- cgit v0.12