[Cmake-commits] [cmake-commits] hoffman committed Linux.cmake 1.18 1.18.2.1 OpenBSD.cmake 1.6 1.6.14.1 Windows-gcc.cmake 1.20 1.20.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Linux.cmake OpenBSD.cmake Windows-gcc.cmake 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C 2 -d -r1.18 -r1.18.2.1
*** Linux.cmake	21 Feb 2008 16:41:10 -0000	1.18
--- Linux.cmake	24 Oct 2008 15:18:45 -0000	1.18.2.1
***************
*** 60,61 ****
--- 60,63 ----
    SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
  ENDIF(EXISTS "/etc/debian_version")
+ # always include the gcc compiler information
+ INCLUDE(Platform/gcc)

Index: Windows-gcc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-gcc.cmake,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C 2 -d -r1.20 -r1.20.2.1
*** Windows-gcc.cmake	30 Jan 2008 01:46:25 -0000	1.20
--- Windows-gcc.cmake	24 Oct 2008 15:18:45 -0000	1.20.2.1
***************
*** 16,19 ****
--- 16,25 ----
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")       # -rpath
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "")   # : or empty
+ 
+ SET(CMAKE_SHARED_MODULE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")               # -pic 
+ SET(CMAKE_SHARED_MODULE_CXX_FLAGS 
+   "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")           # -pic 
+ SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS 
+   "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}") # -shared
  SET(CMAKE_LIBRARY_PATH_FLAG "-L")
  SET(CMAKE_LINK_LIBRARY_FLAG "-l")
***************
*** 24,27 ****
--- 30,35 ----
    SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a" ".lib")
+   SET (CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
+   SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
  ENDIF(MINGW)
  

Index: OpenBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/OpenBSD.cmake,v
retrieving revision 1.6
retrieving revision 1.6.14.1
diff -C 2 -d -r1.6 -r1.6.14.1
*** OpenBSD.cmake	27 Mar 2006 16:09:19 -0000	1.6
--- OpenBSD.cmake	24 Oct 2008 15:18:45 -0000	1.6.14.1
***************
*** 1,2 ****
--- 1,3 ----
  SET(CMAKE_DL_LIBS "")
+ SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)
  INCLUDE(Platform/UnixPaths)