[Cmake-commits] [cmake-commits] king committed BeOS.cmake 1.4 1.5 Darwin.cmake 1.61 1.62 FreeBSD.cmake 1.12 1.13 GNU.cmake 1.2 1.3 Haiku.cmake 1.5 1.6 IRIX.cmake 1.14 1.15 IRIX64.cmake 1.20 1.21 Linux-Intel-Fortran.cmake 1.5 1.6 Linux-SunPro-C.cmake 1.4 1.5 Linux.cmake 1.21 1.22 NetBSD.cmake 1.9 1.10 OSF1.cmake 1.14 1.15 QNX.cmake 1.12 1.13 syllable.cmake 1.2 1.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Dec 2 15:17:55 EST 2009
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv28846/Modules/Platform
Modified Files:
BeOS.cmake Darwin.cmake FreeBSD.cmake GNU.cmake Haiku.cmake
IRIX.cmake IRIX64.cmake Linux-Intel-Fortran.cmake
Linux-SunPro-C.cmake Linux.cmake NetBSD.cmake OSF1.cmake
QNX.cmake syllable.cmake
Log Message:
Reduce duplication in Platform/<os>.cmake files
Several platform-wide linker flag variables are defined in
Modules/Platform/<os>.cmake files for C and then copied by the
Modules/CMake<lang>Information.cmake file for each language.
We now use this approach for the variables
CMAKE_EXE_EXPORTS_${lang}_FLAG
CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG
CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS
to avoid duplication for multiple languages in each platform file.
Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** Linux.cmake 2 Dec 2009 14:52:00 -0000 1.21
--- Linux.cmake 2 Dec 2009 20:17:53 -0000 1.22
***************
*** 7,14 ****
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
- SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
# Shared libraries with no builtin soname may not be linked safely by
--- 7,11 ----
Index: OSF1.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/OSF1.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** OSF1.cmake 27 Mar 2006 15:46:42 -0000 1.14
--- OSF1.cmake 2 Dec 2009 20:17:53 -0000 1.15
***************
*** 13,17 ****
IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-expect_unresolved,\\*") # -shared
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -Wl,-expect_unresolved,\\*") # -shared
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-Wl,-rpath,")
--- 13,16 ----
Index: QNX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/QNX.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** QNX.cmake 2 Dec 2009 14:52:00 -0000 1.12
--- QNX.cmake 2 Dec 2009 20:17:53 -0000 1.13
***************
*** 13,19 ****
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
- SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
# Shared libraries with no builtin soname may not be linked safely by
--- 13,17 ----
Index: BeOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/BeOS.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** BeOS.cmake 2 Dec 2009 14:51:53 -0000 1.4
--- BeOS.cmake 2 Dec 2009 20:17:52 -0000 1.5
***************
*** 7,11 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
INCLUDE(Platform/UnixPaths)
--- 7,10 ----
Index: NetBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/NetBSD.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** NetBSD.cmake 2 Feb 2008 13:58:53 -0000 1.9
--- NetBSD.cmake 2 Dec 2009 20:17:53 -0000 1.10
***************
*** 8,14 ****
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
- SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
ENDIF(EXISTS /usr/include/dlfcn.h)
--- 8,12 ----
Index: syllable.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/syllable.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** syllable.cmake 16 Jan 2008 14:51:57 -0000 1.2
--- syllable.cmake 2 Dec 2009 20:17:53 -0000 1.3
***************
*** 15,21 ****
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
#SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
- #SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
# Initialize C link type selection flags. These flags are used when
--- 15,19 ----
Index: Linux-Intel-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-Fortran.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** Linux-Intel-Fortran.cmake 27 Oct 2009 14:50:43 -0000 1.5
--- Linux-Intel-Fortran.cmake 2 Dec 2009 20:17:52 -0000 1.6
***************
*** 13,16 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,-rpath,")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
SET(CMAKE_DL_LIBS "dl")
--- 13,15 ----
Index: IRIX64.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX64.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** IRIX64.cmake 27 Feb 2008 19:31:09 -0000 1.20
--- IRIX64.cmake 2 Dec 2009 20:17:52 -0000 1.21
***************
*** 1,9 ****
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "") # : or empty
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
IF(NOT CMAKE_COMPILER_IS_GNUCC)
# Set default flags init.
--- 1,7 ----
Index: Linux-SunPro-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-SunPro-C.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** Linux-SunPro-C.cmake 21 Aug 2009 14:32:26 -0000 1.4
--- Linux-SunPro-C.cmake 2 Dec 2009 20:17:53 -0000 1.5
***************
*** 1,3 ****
# Linux sun studio c options
SET(CMAKE_DL_LIBS "dl")
- SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
--- 1,2 ----
Index: Haiku.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Haiku.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** Haiku.cmake 2 Dec 2009 14:52:00 -0000 1.5
--- Haiku.cmake 2 Dec 2009 20:17:52 -0000 1.6
***************
*** 7,11 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
INCLUDE(Platform/UnixPaths)
--- 7,10 ----
Index: GNU.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/GNU.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** GNU.cmake 1 Dec 2009 19:25:21 -0000 1.2
--- GNU.cmake 2 Dec 2009 20:17:52 -0000 1.3
***************
*** 6,9 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
INCLUDE(Platform/UnixPaths)
--- 6,8 ----
Index: IRIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** IRIX.cmake 1 Feb 2008 14:57:41 -0000 1.14
--- IRIX.cmake 2 Dec 2009 20:17:52 -0000 1.15
***************
*** 1,5 ****
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -rdata_shared")
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -rdata_shared")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP "") # : or empty
--- 1,4 ----
Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.61
retrieving revision 1.62
diff -C 2 -d -r1.61 -r1.62
*** Darwin.cmake 19 Sep 2009 14:14:31 -0000 1.61
--- Darwin.cmake 2 Dec 2009 20:17:52 -0000 1.62
***************
*** 173,178 ****
# soname computation.
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name")
- SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-install_name")
ENDIF(NOT XCODE)
--- 173,176 ----
Index: FreeBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/FreeBSD.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** FreeBSD.cmake 21 Feb 2008 16:41:10 -0000 1.12
--- FreeBSD.cmake 2 Dec 2009 20:17:52 -0000 1.13
***************
*** 8,14 ****
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
- SET(CMAKE_EXE_EXPORTS_CXX_FLAG "-Wl,--export-dynamic")
ENDIF(EXISTS /usr/include/dlfcn.h)
--- 8,12 ----
More information about the Cmake-commits
mailing list