summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-03-03 15:09:18 (GMT)
committerBrad King <brad.king@kitware.com>2007-03-03 15:09:18 (GMT)
commit42e1ffb7f5ef5c8a570e08f4a587f34458172325 (patch)
tree19100ce26035329f3d362db9c2c3e6832a2de06a
parent399c3dffcef56ca61ef6661be8e82223aa25d1ce (diff)
downloadCMake-42e1ffb7f5ef5c8a570e08f4a587f34458172325.zip
CMake-42e1ffb7f5ef5c8a570e08f4a587f34458172325.tar.gz
CMake-42e1ffb7f5ef5c8a570e08f4a587f34458172325.tar.bz2
BUG: Do not create import library for MODULEs. The TARGET_IMPLIB name is not set correctly for MODULE rules anyway.
-rw-r--r--Modules/Platform/Windows-bcc32.cmake24
1 files 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_CXX_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD <LINK_FLAGS> -tWR <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
- "implib -c -w <TARGET_IMPLIB> <TARGET>"
)
-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 <TARGET_IMPLIB> <TARGET>"
+ )
-# create a C shared library
-SET(CMAKE_C_CREATE_SHARED_LIBRARY
+# Create a C module library.
+SET(CMAKE_C_CREATE_SHARED_MODULE
"<CMAKE_C_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD <LINK_FLAGS> -tWR <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
- "implib -c -w <TARGET_IMPLIB> <TARGET>"
)
-# 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 <TARGET_IMPLIB> <TARGET>"
+ )
# create a C++ static library
SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET_QUOTED> <OBJECTS_QUOTED>${CMAKE_END_TEMP_FILE}")