[cmake-commits] king committed Windows-bcc32.cmake 1.38 1.39

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv596

Modified Files:
	Windows-bcc32.cmake 
Log Message:
BUG: Do not create import library for MODULEs.  The TARGET_IMPLIB name is not set correctly for MODULE rules anyway.


Index: Windows-bcc32.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-bcc32.cmake,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Windows-bcc32.cmake	11 Apr 2006 20:55:48 -0000	1.38
+++ Windows-bcc32.cmake	3 Mar 2007 15:09:18 -0000	1.39
@@ -26,23 +26,27 @@
 # 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}")