[cmake-commits] hoffman committed Windows-bcc32.cmake 1.38 1.38.2.1 gcc.cmake 1.10.6.1 1.10.6.2

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 16 17:05:44 EST 2007


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

Modified Files:
      Tag: CMake-2-4
	Windows-bcc32.cmake gcc.cmake 
Log Message:
ENH: check in fixes from main tree to create 2.4.7 RC 5


Index: gcc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/gcc.cmake,v
retrieving revision 1.10.6.1
retrieving revision 1.10.6.2
diff -u -d -r1.10.6.1 -r1.10.6.2
--- gcc.cmake	13 Oct 2006 14:52:01 -0000	1.10.6.1
+++ gcc.cmake	16 Mar 2007 22:05:42 -0000	1.10.6.2
@@ -6,7 +6,9 @@
   SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
   SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
   SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-  SET (CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+  IF(NOT APPLE)
+    SET (CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+  ENDIF(NOT APPLE)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
@@ -17,6 +19,8 @@
   SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
   SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
   SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
-  SET (CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
+  IF(NOT APPLE)
+    SET (CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
+  ENDIF(NOT APPLE)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 

Index: Windows-bcc32.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-bcc32.cmake,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- Windows-bcc32.cmake	11 Apr 2006 20:55:48 -0000	1.38
+++ Windows-bcc32.cmake	16 Mar 2007 22:05:42 -0000	1.38.2.1
@@ -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}")



More information about the Cmake-commits mailing list