[Cmake-commits] [cmake-commits] king committed Linux-SunPro-C.cmake 1.3 1.4 Linux-SunPro-CXX.cmake 1.3 1.4 Linux-SunPro-Fortran.cmake 1.3 1.4 SunOS-SunPro-Fortran.cmake 1.2 NONE SunOS.cmake 1.25 1.26
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Aug 21 10:32:28 EDT 2009
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv15473/Modules/Platform
Modified Files:
Linux-SunPro-C.cmake Linux-SunPro-CXX.cmake
Linux-SunPro-Fortran.cmake SunOS.cmake
Removed Files:
SunOS-SunPro-Fortran.cmake
Log Message:
Split SunPro compiler information files
This moves platform-independent SunPro compiler flags into separate
"Compiler/SunPro-<lang>.cmake" modules. Platform-specific flags are
left untouched.
Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** SunOS.cmake 30 Apr 2008 18:13:11 -0000 1.25
--- SunOS.cmake 21 Aug 2009 14:32:26 -0000 1.26
***************
*** 4,22 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
IF(CMAKE_SYSTEM MATCHES "SunOS-5.*")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-KPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-KPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":")
IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
--- 4,10 ----
***************
*** 25,34 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h")
- ELSE(CMAKE_COMPILER_IS_GNUCC)
- SET (CMAKE_C_FLAGS_INIT "")
- SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
- SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-xO3 -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELEASE_INIT "-xO2 -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-xO2")
ENDIF(CMAKE_COMPILER_IS_GNUCC)
IF(CMAKE_COMPILER_IS_GNUCXX)
--- 13,16 ----
***************
*** 38,47 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h")
- ELSE(CMAKE_COMPILER_IS_GNUCXX)
- SET (CMAKE_CXX_FLAGS_INIT "")
- SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
- SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-xO3 -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-xO2 -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-xO2")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_SYSTEM MATCHES "SunOS-5.*")
--- 20,23 ----
***************
*** 54,63 ****
# Take default rule from CMakeDefaultMakeRuleVariables.cmake.
ENDIF(CMAKE_COMPILER_IS_GNUCC)
- ELSE(CMAKE_COMPILER_IS_GNUCXX)
- IF(CMAKE_CXX_COMPILER)
- SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
- "<CMAKE_CXX_COMPILER> -xar -o <TARGET> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET> ")
- ENDIF(CMAKE_CXX_COMPILER)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
INCLUDE(Platform/UnixPaths)
--- 30,33 ----
***************
*** 69,82 ****
ENDIF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
- IF(NOT CMAKE_COMPILER_IS_GNUCC)
- SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
- SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- ENDIF(NOT CMAKE_COMPILER_IS_GNUCC)
-
- IF(NOT CMAKE_COMPILER_IS_GNUCXX)
- SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
- SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
-
# Initialize C link type selection flags. These flags are used when
# building a shared library, shared module, or executable that links
--- 39,42 ----
***************
*** 88,96 ****
SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
ENDFOREACH(type)
- ELSE(CMAKE_COMPILER_IS_GNUCC)
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic")
- ENDFOREACH(type)
ENDIF(CMAKE_COMPILER_IS_GNUCC)
IF(CMAKE_COMPILER_IS_GNUCXX)
--- 48,51 ----
***************
*** 99,107 ****
SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Wl,-Bdynamic")
ENDFOREACH(type)
- ELSE(CMAKE_COMPILER_IS_GNUCXX)
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Bdynamic")
- ENDFOREACH(type)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
--- 54,57 ----
Index: Linux-SunPro-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-SunPro-CXX.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** Linux-SunPro-CXX.cmake 13 Jul 2009 14:40:15 -0000 1.3
--- Linux-SunPro-CXX.cmake 21 Aug 2009 14:32:26 -0000 1.4
***************
*** 1,25 ****
# Linux sun studio c++ options
SET(CMAKE_DL_LIBS "dl")
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-KPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G")
- SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG "-rpath-link ")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h")
SET(CMAKE_EXE_EXPORTS_CXX_FLAG "--export-dynamic")
-
- SET(CMAKE_CXX_FLAGS_INIT "")
- SET(CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG")
- SET(CMAKE_CXX_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g -xO2")
-
- # Initialize C link type selection flags. These flags are used when
- # building a shared library, shared module, or executable that links
- # to other libraries to select whether to use the static or shared
- # versions of the libraries.
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Bdynamic")
- ENDFOREACH(type)
--- 1,4 ----
--- SunOS-SunPro-Fortran.cmake DELETED ---
Index: Linux-SunPro-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-SunPro-C.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** Linux-SunPro-C.cmake 29 Jan 2008 12:48:22 -0000 1.3
--- Linux-SunPro-C.cmake 21 Aug 2009 14:32:26 -0000 1.4
***************
*** 1,24 ****
# Linux sun studio c options
SET(CMAKE_DL_LIBS "dl")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-KPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-
- SET(CMAKE_C_FLAGS_INIT "")
- SET(CMAKE_C_FLAGS_DEBUG_INIT "-g")
- SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG")
- SET(CMAKE_C_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-g -xO2")
-
- # Initialize C link type selection flags. These flags are used when
- # building a shared library, shared module, or executable that links
- # to other libraries to select whether to use the static or shared
- # versions of the libraries.
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic")
- ENDFOREACH(type)
--- 1,3 ----
Index: Linux-SunPro-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-SunPro-Fortran.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** Linux-SunPro-Fortran.cmake 30 Dec 2007 21:11:37 -0000 1.3
--- Linux-SunPro-Fortran.cmake 21 Aug 2009 14:32:26 -0000 1.4
***************
*** 1,16 ****
# Linux sun studio fortran options
SET(CMAKE_DL_LIBS "dl")
- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-KPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-G")
- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-h")
-
- SET(CMAKE_Fortran_FLAGS_INIT "")
- SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
- SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG")
- SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG")
- SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-g -xO2")
- SET(CMAKE_Fortran_MODDIR_FLAG "-moddir=")
- SET(CMAKE_Fortran_MODPATH_FLAG "-M")
--- 1,2 ----
More information about the Cmake-commits
mailing list