[Cmake-commits] [cmake-commits] king committed AIX-GNU-C.cmake NONE 1.1.2.2 AIX-GNU-CXX.cmake NONE 1.1.2.2 AIX-GNU-Fortran.cmake NONE 1.1.2.2 AIX-GNU.cmake NONE 1.1.2.2 AIX.cmake 1.21.4.1 1.21.4.2 BeOS.cmake 1.3 1.3.4.1 CYGWIN-GNU-C.cmake NONE 1.1.2.2 CYGWIN-GNU-CXX.cmake NONE 1.1.2.2 CYGWIN-GNU-Fortran.cmake NONE 1.1.2.2 CYGWIN-GNU.cmake NONE 1.3.2.2 CYGWIN-g77.cmake 1.4 NONE CYGWIN.cmake 1.21 1.21.2.1 Darwin-GNU-C.cmake 1.1 1.1.2.1 Darwin-GNU-CXX.cmake 1.1 1.1.2.1 Darwin-GNU-Fortran.cmake NONE 1.1.2.2 Darwin-GNU.cmake 1.1 1.1.2.1 Darwin.cmake 1.61 1.61.2.1 FreeBSD.cmake 1.12 1.12.4.1 GNU.cmake 1.1 1.1.6.1 HP-UX-GNU-C.cmake NONE 1.1.2.2 HP-UX-GNU-CXX.cmake NONE 1.1.2.2 HP-UX-GNU-Fortran.cmake NONE 1.1.2.2 HP-UX-GNU.cmake NONE 1.1.2.2 HP-UX.cmake 1.34 1.34.2.1 Haiku.cmake 1.3.2.1 1.3.2.2 IRIX.cmake 1.14 1.14.4.1 IRIX64.cmake 1.20 1.20.4.1 Linux-GNU-C.cmake NONE 1.1.2.2 Linux-GNU-CXX.cmake NONE 1.1.2.2 Linux-GNU-Fortran.cmake 1.2 1.2.2.1 Linux-GNU.cmake NONE 1.2.2.2 Linux-Intel-C.cmake 1.4.2.1 1.4.2.2 Linux-Intel-CXX.cmake 1.6.2.1 1.6.2.2 Linux-Intel-Fortran.cmake 1.3.2.2 1.3.2.3 Linux-Intel.cmake 1.1.2.1 1.1.2.2 Linux-PGI-C.cmake 1.2 1.2.4.1 Linux-PGI-CXX.cmake 1.2 1.2.4.1 Linux-PGI-Fortran.cmake 1.2 1.2.4.1 Linux-PGI.cmake NONE 1.1.2.2 Linux-PathScale-C.cmake NONE 1.1.2.2 Linux-PathScale-CXX.cmake NONE 1.1.2.2 Linux-PathScale-Fortran.cmake NONE 1.1.2.2 Linux-PathScale.cmake NONE 1.1.2.2 Linux-SunPro-C.cmake 1.4 NONE Linux-SunPro-CXX.cmake 1.4 1.4.2.1 Linux-SunPro-Fortran.cmake 1.4 NONE Linux-XL-C.cmake 1.1.2.1 1.1.2.2 Linux-XL-CXX.cmake 1.1.2.1 1.1.2.2 Linux-XL-Fortran.cmake 1.1.2.1 1.1.2.2 Linux-como.cmake 1.5 1.5.20.1 Linux.cmake 1.19 1.19.2.1 NetBSD.cmake 1.9 1.9.4.1 OSF1.cmake 1.14 1.14.16.1 QNX.cmake 1.11 1.11.4.1 SunOS-GNU-C.cmake NONE 1.2.2.2 SunOS-GNU-CXX.cmake NONE 1.1.2.2 SunOS-GNU-Fortran.cmake NONE 1.1.2.2 SunOS-GNU.cmake NONE 1.2.2.2 SunOS.cmake 1.26 1.26.2.1 UnixPaths.cmake 1.14.2.1 1.14.2.2 Windows-GNU-C.cmake NONE 1.1.2.2 Windows-GNU-CXX.cmake NONE 1.1.2.2 Windows-GNU-Fortran.cmake NONE 1.1.2.2 Windows-GNU.cmake NONE 1.1.2.2 Windows-cl.cmake 1.93 1.93.2.1 Windows-g77.cmake 1.3.2.1 NONE Windows-gcc.cmake 1.22 NONE Windows-icl.cmake 1.6.2.1 1.6.2.2 Windows-wcl386.cmake 1.8 1.8.4.1 g77.cmake 1.2 NONE gcc.cmake 1.16 NONE syllable.cmake 1.2 1.2.4.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:47:51 EST 2010
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv23913/Modules/Platform
Modified Files:
Tag: CMake-2-8
AIX.cmake BeOS.cmake CYGWIN.cmake Darwin-GNU-C.cmake
Darwin-GNU-CXX.cmake Darwin-GNU.cmake Darwin.cmake
FreeBSD.cmake GNU.cmake HP-UX.cmake Haiku.cmake IRIX.cmake
IRIX64.cmake Linux-GNU-Fortran.cmake Linux-Intel-C.cmake
Linux-Intel-CXX.cmake Linux-Intel-Fortran.cmake
Linux-Intel.cmake Linux-PGI-C.cmake Linux-PGI-CXX.cmake
Linux-PGI-Fortran.cmake Linux-SunPro-CXX.cmake
Linux-XL-C.cmake Linux-XL-CXX.cmake Linux-XL-Fortran.cmake
Linux-como.cmake Linux.cmake NetBSD.cmake OSF1.cmake QNX.cmake
SunOS.cmake UnixPaths.cmake Windows-cl.cmake Windows-icl.cmake
Windows-wcl386.cmake syllable.cmake
Added Files:
Tag: CMake-2-8
AIX-GNU-C.cmake AIX-GNU-CXX.cmake AIX-GNU-Fortran.cmake
AIX-GNU.cmake CYGWIN-GNU-C.cmake CYGWIN-GNU-CXX.cmake
CYGWIN-GNU-Fortran.cmake CYGWIN-GNU.cmake
Darwin-GNU-Fortran.cmake HP-UX-GNU-C.cmake HP-UX-GNU-CXX.cmake
HP-UX-GNU-Fortran.cmake HP-UX-GNU.cmake Linux-GNU-C.cmake
Linux-GNU-CXX.cmake Linux-GNU.cmake Linux-PGI.cmake
Linux-PathScale-C.cmake Linux-PathScale-CXX.cmake
Linux-PathScale-Fortran.cmake Linux-PathScale.cmake
SunOS-GNU-C.cmake SunOS-GNU-CXX.cmake SunOS-GNU-Fortran.cmake
SunOS-GNU.cmake Windows-GNU-C.cmake Windows-GNU-CXX.cmake
Windows-GNU-Fortran.cmake Windows-GNU.cmake
Removed Files:
Tag: CMake-2-8
CYGWIN-g77.cmake Linux-SunPro-C.cmake
Linux-SunPro-Fortran.cmake Windows-g77.cmake Windows-gcc.cmake
g77.cmake gcc.cmake
Log Message:
CMake 2.8.1-rc1
Index: Linux-XL-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-C.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** Linux-XL-C.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
--- Linux-XL-C.cmake 28 Jan 2010 21:47:44 -0000 1.1.2.2
***************
*** 1,3 ****
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-qmkshrobj")
--- 1 ----
Index: NetBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/NetBSD.cmake,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C 2 -d -r1.9 -r1.9.4.1
*** NetBSD.cmake 2 Feb 2008 13:58:53 -0000 1.9
--- NetBSD.cmake 28 Jan 2010 21:47:47 -0000 1.9.4.1
***************
*** 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 ----
--- Linux-SunPro-Fortran.cmake DELETED ---
Index: Linux-PGI-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-PGI-CXX.cmake,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** Linux-PGI-CXX.cmake 27 Feb 2008 19:31:09 -0000 1.2
--- Linux-PGI-CXX.cmake 28 Jan 2010 21:47:44 -0000 1.2.4.1
***************
*** 1,4 ****
! SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
!
! SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
! SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
--- 1,2 ----
! include(Platform/Linux-PGI)
! __linux_compiler_pgi(CXX)
Index: Windows-wcl386.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-wcl386.cmake,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C 2 -d -r1.8 -r1.8.4.1
*** Windows-wcl386.cmake 23 Jan 2008 18:30:55 -0000 1.8
--- Windows-wcl386.cmake 28 Jan 2010 21:47:48 -0000 1.8.4.1
***************
*** 28,36 ****
SET(CMAKE_C_CREATE_IMPORT_LIBRARY
! "wlib -q -n -b <TARGET_IMPLIB> +<TARGET>")
SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
SET(CMAKE_C_LINK_EXECUTABLE
! "wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name <TARGET> option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
--- 28,36 ----
SET(CMAKE_C_CREATE_IMPORT_LIBRARY
! "wlib -q -n -b <TARGET_IMPLIB> +'<TARGET_UNQUOTED>'")
SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
SET(CMAKE_C_LINK_EXECUTABLE
! "wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
***************
*** 53,57 ****
SET(CMAKE_CXX_CREATE_SHARED_MODULE
! "wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name <TARGET> option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_MODULE}
--- 53,57 ----
SET(CMAKE_CXX_CREATE_SHARED_MODULE
! "wlink ${CMAKE_START_TEMP_FILE} system nt_dll ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
${CMAKE_CXX_CREATE_SHARED_MODULE}
***************
*** 65,69 ****
# create a C++ static library
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "wlib ${CMAKE_LIB_QUIET} -n -b <TARGET> <OBJECTS> ")
# create a C static library
--- 65,69 ----
# create a C++ static library
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY "wlib ${CMAKE_LIB_QUIET} -n -b '<TARGET_UNQUOTED>' <OBJECTS> ")
# create a C static library
Index: Haiku.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Haiku.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** Haiku.cmake 1 Oct 2009 21:20:35 -0000 1.3.2.1
--- Haiku.cmake 28 Jan 2010 21:47:43 -0000 1.3.2.2
***************
*** 1,7 ****
SET(BEOS 1)
- # GCC is the default compiler on Haiku.
- INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-
SET(CMAKE_DL_LIBS root be)
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
--- 1,4 ----
***************
*** 10,14 ****
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: HP-UX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/HP-UX.cmake,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C 2 -d -r1.34 -r1.34.2.1
*** HP-UX.cmake 19 Jun 2009 21:09:36 -0000 1.34
--- HP-UX.cmake 28 Jan 2010 21:47:43 -0000 1.34.2.1
***************
*** 16,26 ****
# fortran
IF(CMAKE_COMPILER_IS_GNUG77)
- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC") # -pic
- SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared -Wl,-E,-b,+nodefaultrpath") # -shared
- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-Wl,+s,-E,+nodefaultrpath") # +s, flag for exe link to use shared lib
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,+b") # -rpath
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":") # : or empty
- SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,+h")
- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC") # -pic
ELSE(CMAKE_COMPILER_IS_GNUG77)
# use ld directly to create shared libraries for hp cc
--- 16,19 ----
***************
*** 38,49 ****
# C compiler
IF(CMAKE_COMPILER_IS_GNUCC)
- # gnu gcc
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-E,-b,+nodefaultrpath") # -shared
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,+s,-E,+nodefaultrpath") # +s, flag for exe link to use shared lib
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,+b") # -rpath
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
- SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,+h")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
ELSE(CMAKE_COMPILER_IS_GNUCC)
# hp cc
--- 31,34 ----
***************
*** 65,76 ****
# CXX compiler
IF(CMAKE_COMPILER_IS_GNUCXX)
- # for gnu C++
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC") # -pic
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -Wl,-E,-b,+nodefaultrpath") # -shared
- SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-Wl,+s,-E,+nodefaultrpath") # +s, flag for exe link to use shared lib
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-Wl,+b") # -rpath
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":") # : or empty
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC") # -pic
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,+h")
ELSE(CMAKE_COMPILER_IS_GNUCXX)
# for hp aCC
--- 50,53 ----
Index: Linux-Intel-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-CXX.cmake,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** Linux-Intel-CXX.cmake 9 Oct 2009 20:11:12 -0000 1.6.2.1
--- Linux-Intel-CXX.cmake 28 Jan 2010 21:47:44 -0000 1.6.2.2
***************
*** 1,8 ****
INCLUDE(Platform/Linux-Intel)
! IF(XIAR)
! # INTERPROCEDURAL_OPTIMIZATION
! SET(CMAKE_CXX_COMPILE_OPTIONS_IPO -ipo)
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY_IPO
! "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "${XIAR} -s <TARGET> ")
! ENDIF(XIAR)
--- 1,2 ----
INCLUDE(Platform/Linux-Intel)
! __linux_compiler_intel(CXX)
--- NEW FILE: Windows-GNU-C.cmake ---
include(Platform/Windows-GNU)
__windows_compiler_gnu(C)
--- NEW FILE: SunOS-GNU-Fortran.cmake ---
include(Platform/SunOS-GNU)
__sunos_compiler_gnu(Fortran)
--- NEW FILE: SunOS-GNU.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__SUNOS_COMPILER_GNU)
return()
endif()
set(__SUNOS_COMPILER_GNU 1)
macro(__sunos_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-R")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-h")
# 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_${lang}_FLAGS "-Wl,-Bstatic")
set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
endforeach()
endmacro()
Index: Linux-PGI-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-PGI-Fortran.cmake,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** Linux-PGI-Fortran.cmake 17 May 2008 21:35:35 -0000 1.2
--- Linux-PGI-Fortran.cmake 28 Jan 2010 21:47:44 -0000 1.2.4.1
***************
*** 1,9 ****
! SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "")
!
! SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
! SET(CMAKE_Fortran_FLAGS_INIT "-Mpreprocess -Kieee -fpic")
! SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g -O0 -Mbounds")
! SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-O2 -s")
! SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-fast -O3 -Mipa=fast")
! SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -gopt")
!
--- 1,2 ----
! include(Platform/Linux-PGI)
! __linux_compiler_pgi(Fortran)
Index: Darwin-GNU-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin-GNU-CXX.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Darwin-GNU-CXX.cmake 19 Sep 2009 14:14:31 -0000 1.1
--- Darwin-GNU-CXX.cmake 28 Jan 2010 21:47:43 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,3 ----
include(Platform/Darwin-GNU)
+ __darwin_compiler_gnu(CXX)
cmake_gnu_has_isysroot(CXX)
Index: BeOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/BeOS.cmake,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C 2 -d -r1.3 -r1.3.4.1
*** BeOS.cmake 10 Aug 2007 12:54:42 -0000 1.3
--- BeOS.cmake 28 Jan 2010 21:47:43 -0000 1.3.4.1
***************
*** 1,7 ****
SET(BEOS 1)
- # GCC is the default compiler on BeOS.
- INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
-
SET(CMAKE_DL_LIBS root be)
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
--- 1,4 ----
***************
*** 10,14 ****
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: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -C 2 -d -r1.61 -r1.61.2.1
*** Darwin.cmake 19 Sep 2009 14:14:31 -0000 1.61
--- Darwin.cmake 28 Jan 2010 21:47:43 -0000 1.61.2.1
***************
*** 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 ----
--- NEW FILE: HP-UX-GNU-C.cmake ---
include(Platform/HP-UX-GNU)
__hpux_compiler_gnu(C)
Index: Darwin-GNU.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin-GNU.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Darwin-GNU.cmake 19 Sep 2009 14:14:31 -0000 1.1
--- Darwin-GNU.cmake 28 Jan 2010 21:47:43 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,28 ----
+
+ #=============================================================================
+ # Copyright 2002-2009 Kitware, Inc.
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
+ # (To distributed this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
+ # This module is shared by multiple languages; use include blocker.
+ if(__DARWIN_COMPILER_GNU)
+ return()
+ endif()
+ set(__DARWIN_COMPILER_GNU 1)
+
+ macro(__darwin_compiler_gnu lang)
+ # GNU does not have -shared on OS X
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-dynamiclib -headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -headerpad_max_install_names")
+ endmacro()
+
macro(cmake_gnu_has_isysroot lang)
if("x${CMAKE_${lang}_HAS_ISYSROOT}" STREQUAL "x")
Index: OSF1.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/OSF1.cmake,v
retrieving revision 1.14
retrieving revision 1.14.16.1
diff -C 2 -d -r1.14 -r1.14.16.1
*** OSF1.cmake 27 Mar 2006 15:46:42 -0000 1.14
--- OSF1.cmake 28 Jan 2010 21:47:47 -0000 1.14.16.1
***************
*** 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: Linux-como.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-como.cmake,v
retrieving revision 1.5
retrieving revision 1.5.20.1
diff -C 2 -d -r1.5 -r1.5.20.1
*** Linux-como.cmake 22 Sep 2004 18:42:05 -0000 1.5
--- Linux-como.cmake 28 Jan 2010 21:47:44 -0000 1.5.20.1
***************
*** 16,18 ****
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "")
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
--- 16,17 ----
--- NEW FILE: AIX-GNU-Fortran.cmake ---
include(Platform/AIX-GNU)
__aix_compiler_gnu(Fortran)
--- NEW FILE: Linux-GNU-CXX.cmake ---
INCLUDE(Platform/Linux-GNU)
__linux_compiler_gnu(CXX)
--- NEW FILE: Linux-PathScale-C.cmake ---
include(Platform/Linux-PathScale)
__linux_compiler_pathscale(C)
--- NEW FILE: CYGWIN-GNU.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__CYGWIN_COMPILER_GNU)
return()
endif()
set(__CYGWIN_COMPILER_GNU 1)
# TODO: Is -Wl,--enable-auto-import now always default?
set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--enable-auto-import")
set(CMAKE_CREATE_WIN32_EXE "-mwindows")
set(CMAKE_GNULD_IMAGE_VERSION
"-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
macro(__cygwin_compiler_gnu lang)
# Binary link rules.
set(CMAKE_${lang}_CREATE_SHARED_MODULE
"<CMAKE_${lang}_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_${lang}_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
"<CMAKE_${lang}_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
set(CMAKE_${lang}_LINK_EXECUTABLE
"<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "") # No -fPIC on cygwin
# 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_${lang}_FLAGS "-Wl,-Bstatic")
SET(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
ENDFOREACH(type)
# TODO: Is -Wl,--enable-auto-import now always default?
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,--enable-auto-import")
set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}")
endmacro()
--- NEW FILE: Linux-GNU-C.cmake ---
INCLUDE(Platform/Linux-GNU)
__linux_compiler_gnu(C)
Index: IRIX64.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX64.cmake,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -C 2 -d -r1.20 -r1.20.4.1
*** IRIX64.cmake 27 Feb 2008 19:31:09 -0000 1.20
--- IRIX64.cmake 28 Jan 2010 21:47:43 -0000 1.20.4.1
***************
*** 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 ----
--- NEW FILE: Darwin-GNU-Fortran.cmake ---
include(Platform/Darwin-GNU)
__darwin_compiler_gnu(Fortran)
Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C 2 -d -r1.26 -r1.26.2.1
*** SunOS.cmake 21 Aug 2009 14:32:26 -0000 1.26
--- SunOS.cmake 28 Jan 2010 21:47:48 -0000 1.26.2.1
***************
*** 6,26 ****
ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
- IF(CMAKE_SYSTEM MATCHES "SunOS-5.*")
- IF(CMAKE_COMPILER_IS_GNUCC)
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h")
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-Wl,-R")
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":")
- SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h")
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_SYSTEM MATCHES "SunOS-5.*")
-
IF(CMAKE_COMPILER_IS_GNUCXX)
IF(CMAKE_COMPILER_IS_GNUCC)
--- 6,9 ----
***************
*** 39,59 ****
ENDIF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
- # 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.
- IF(CMAKE_COMPILER_IS_GNUCC)
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
- ENDFOREACH(type)
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
- IF(CMAKE_COMPILER_IS_GNUCXX)
- FOREACH(type SHARED_LIBRARY SHARED_MODULE EXE)
- SET(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Wl,-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Wl,-Bdynamic")
- ENDFOREACH(type)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
# The Sun linker needs to find transitive shared library dependencies
# in the -L path.
--- 22,25 ----
--- NEW FILE: HP-UX-GNU.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__HPUX_COMPILER_GNU)
return()
endif()
set(__HPUX_COMPILER_GNU 1)
macro(__hpux_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-E,-b,+nodefaultrpath")
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,+s,-E,+nodefaultrpath")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,+b")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,+h")
endmacro()
--- Windows-gcc.cmake DELETED ---
Index: Darwin-GNU-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin-GNU-C.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Darwin-GNU-C.cmake 19 Sep 2009 14:14:31 -0000 1.1
--- Darwin-GNU-C.cmake 28 Jan 2010 21:47:43 -0000 1.1.2.1
***************
*** 1,2 ****
--- 1,3 ----
include(Platform/Darwin-GNU)
+ __darwin_compiler_gnu(C)
cmake_gnu_has_isysroot(C)
--- NEW FILE: AIX-GNU-C.cmake ---
include(Platform/AIX-GNU)
__aix_compiler_gnu(C)
--- NEW FILE: AIX-GNU-CXX.cmake ---
include(Platform/AIX-GNU)
__aix_compiler_gnu(CXX)
Index: Linux-XL-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-CXX.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** Linux-XL-CXX.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
--- Linux-XL-CXX.cmake 28 Jan 2010 21:47:44 -0000 1.1.2.2
***************
*** 1,5 ****
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-qmkshrobj")
--- 1 ----
Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.93
retrieving revision 1.93.2.1
diff -C 2 -d -r1.93 -r1.93.2.1
*** Windows-cl.cmake 1 Sep 2009 18:33:26 -0000 1.93
--- Windows-cl.cmake 28 Jan 2010 21:47:48 -0000 1.93.2.1
***************
*** 142,171 ****
ENDIF(CMAKE_COMPILER_RETURN)
MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3")
- MESSAGE(STATUS "Check CL platform")
- EXEC_PROGRAM(${CMAKE_TEST_COMPILER} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3
- ARGS /nologo
- \"${testForFreeVCFile}\"
- /link /machine:i386
- OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT
- RETURN_VALUE CMAKE_COMPILER_RETURN
- )
- # if there was an error assume it is a 64bit system
- IF(CMAKE_COMPILER_RETURN)
- FILE(APPEND
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if this is a 64 bit system passed:\n"
- "${CMAKE_COMPILER_OUTPUT}\n\n")
- MESSAGE(STATUS "Check CL platform - 64 bit")
- SET(CMAKE_CL_64 1)
- ELSE(CMAKE_COMPILER_RETURN)
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if this is a 32 bit system passed:\n"
- "${CMAKE_COMPILER_OUTPUT}\n\n")
- MESSAGE(STATUS "Check CL platform - 32 bit")
- SET(CMAKE_CL_64 0)
- ENDIF(CMAKE_COMPILER_RETURN)
ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
IF(CMAKE_FORCE_WIN64)
SET(CMAKE_CL_64 1)
--- 142,153 ----
ENDIF(CMAKE_COMPILER_RETURN)
MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3")
ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN)
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
+ IF(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+ SET(CMAKE_CL_64 1)
+ ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+ SET(CMAKE_CL_64 0)
+ ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64)
IF(CMAKE_FORCE_WIN64)
SET(CMAKE_CL_64 1)
***************
*** 236,246 ****
SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
# set the stack size and the machine type
! IF(CMAKE_CL_64)
! SET (CMAKE_EXE_LINKER_FLAGS_INIT
! "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:x64")
! ELSE(CMAKE_CL_64)
! SET (CMAKE_EXE_LINKER_FLAGS_INIT
! "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:I386")
! ENDIF(CMAKE_CL_64)
# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtyp
--- 218,227 ----
SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
# set the stack size and the machine type
! SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID})
! IF(NOT _MACHINE_ARCH_FLAG)
! SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
! ENDIF(NOT _MACHINE_ARCH_FLAG)
! SET (CMAKE_EXE_LINKER_FLAGS_INIT
! "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}")
# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtyp
Index: FreeBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/FreeBSD.cmake,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -C 2 -d -r1.12 -r1.12.4.1
*** FreeBSD.cmake 21 Feb 2008 16:41:10 -0000 1.12
--- FreeBSD.cmake 28 Jan 2010 21:47:43 -0000 1.12.4.1
***************
*** 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 ----
--- NEW FILE: Linux-PGI.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__LINUX_COMPILER_PGI)
return()
endif()
set(__LINUX_COMPILER_PGI 1)
macro(__linux_compiler_pgi lang)
# Shared library compile and link flags.
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
endmacro()
Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C 2 -d -r1.19 -r1.19.2.1
*** Linux.cmake 1 Oct 2008 17:24:51 -0000 1.19
--- Linux.cmake 28 Jan 2010 21:47:44 -0000 1.19.2.1
***************
*** 1,15 ****
- # GCC is the default compiler on Linux.
SET(CMAKE_DL_LIBS "dl")
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
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
--- 1,8 ----
***************
*** 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)
--- 53,54 ----
--- NEW FILE: Linux-PathScale-Fortran.cmake ---
include(Platform/Linux-PathScale)
__linux_compiler_pathscale(Fortran)
Index: GNU.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/GNU.cmake,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C 2 -d -r1.1 -r1.1.6.1
*** GNU.cmake 27 Jun 2007 15:42:10 -0000 1.1
--- GNU.cmake 28 Jan 2010 21:47:43 -0000 1.1.6.1
***************
*** 3,10 ****
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
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)
--- 3,8 ----
--- NEW FILE: Windows-GNU-CXX.cmake ---
include(Platform/Windows-GNU)
__windows_compiler_gnu(CXX)
Index: Linux-XL-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-XL-Fortran.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** Linux-XL-Fortran.cmake 1 Oct 2009 21:20:35 -0000 1.1.2.1
--- Linux-XL-Fortran.cmake 28 Jan 2010 21:47:44 -0000 1.1.2.2
***************
*** 1,3 ****
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-qmkshrobj")
--- 1 ----
Index: AIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/AIX.cmake,v
retrieving revision 1.21.4.1
retrieving revision 1.21.4.2
diff -C 2 -d -r1.21.4.1 -r1.21.4.2
*** AIX.cmake 1 Oct 2009 21:20:35 -0000 1.21.4.1
--- AIX.cmake 28 Jan 2010 21:47:43 -0000 1.21.4.2
***************
*** 16,29 ****
SET_PROPERTY(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1)
- # CXX Compiler
- IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared -Wl,-G") # -shared
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
- # C Compiler
- IF(CMAKE_COMPILER_IS_GNUCC)
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-G") # -shared
- ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
# since .a can be a static or shared library on AIX, we can not do this.
# at some point if we wanted it, we would have to figure out if a .a is
--- 16,19 ----
--- NEW FILE: Windows-GNU.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__WINDOWS_GNU)
return()
endif()
set(__WINDOWS_GNU 1)
set(CMAKE_IMPORT_LIBRARY_PREFIX "lib")
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
set(CMAKE_SHARED_MODULE_PREFIX "lib")
set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
set(CMAKE_EXECUTABLE_SUFFIX ".exe")
set(CMAKE_IMPORT_LIBRARY_SUFFIX ".dll.a")
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
set(CMAKE_SHARED_MODULE_SUFFIX ".dll")
set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
if(MSYS OR MINGW)
set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib
endif()
if(MINGW)
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()
set(CMAKE_DL_LIBS "")
set(CMAKE_LIBRARY_PATH_FLAG "-L")
set(CMAKE_LINK_LIBRARY_FLAG "-l")
set(CMAKE_LINK_LIBRARY_SUFFIX "")
set(CMAKE_CREATE_WIN32_EXE "-mwindows")
set(CMAKE_GNULD_IMAGE_VERSION
"-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
macro(__windows_compiler_gnu lang)
if(MSYS OR MINGW)
# Create archiving rules to support large object file lists for static libraries.
set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
# 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_${lang}_FLAGS "-Wl,-Bstatic")
set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
endforeach(type)
endif()
# Binary link rules.
set(CMAKE_${lang}_CREATE_SHARED_MODULE
"<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_MODULE_${lang}_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
"<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
set(CMAKE_${lang}_LINK_EXECUTABLE
"<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
endmacro()
--- Linux-SunPro-C.cmake DELETED ---
Index: Linux-SunPro-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-SunPro-CXX.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** Linux-SunPro-CXX.cmake 21 Aug 2009 14:32:26 -0000 1.4
--- Linux-SunPro-CXX.cmake 28 Jan 2010 21:47:44 -0000 1.4.2.1
***************
*** 1,4 ****
- # Linux sun studio c++ options
- SET(CMAKE_DL_LIBS "dl")
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG "-rpath-link ")
SET(CMAKE_EXE_EXPORTS_CXX_FLAG "--export-dynamic")
--- 1,2 ----
--- NEW FILE: SunOS-GNU-CXX.cmake ---
include(Platform/SunOS-GNU)
__sunos_compiler_gnu(CXX)
Index: Linux-Intel-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-Fortran.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** Linux-Intel-Fortran.cmake 28 Oct 2009 16:15:02 -0000 1.3.2.2
--- Linux-Intel-Fortran.cmake 28 Jan 2010 21:47:44 -0000 1.3.2.3
***************
*** 1,16 ****
INCLUDE(Platform/Linux-Intel)
! IF(XIAR)
! # INTERPROCEDURAL_OPTIMIZATION
! SET(CMAKE_Fortran_COMPILE_OPTIONS_IPO -ipo)
! SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY_IPO
! "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "${XIAR} -s <TARGET> ")
! ENDIF(XIAR)
!
! SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")
! SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared -i_dynamic -nofor_main")
! SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
! 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")
--- 1,4 ----
INCLUDE(Platform/Linux-Intel)
! __linux_compiler_intel(Fortran)
! set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS} -i_dynamic -nofor_main")
! set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
--- NEW FILE: Linux-PathScale.cmake ---
#=============================================================================
# Copyright 2002-2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__LINUX_COMPILER_PATHSCALE)
return()
endif()
set(__LINUX_COMPILER_PATHSCALE 1)
macro(__linux_compiler_pathscale lang)
# Shared library compile and link flags.
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
endmacro()
--- NEW FILE: CYGWIN-GNU-CXX.cmake ---
include(Platform/CYGWIN-GNU)
__cygwin_compiler_gnu(CXX)
--- NEW FILE: Linux-GNU.cmake ---
#=============================================================================
# Copyright 2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__LINUX_COMPILER_GNU)
return()
endif()
set(__LINUX_COMPILER_GNU 1)
macro(__linux_compiler_gnu lang)
# We pass this for historical reasons. Projects may have
# executables that use dlopen but do not set ENABLE_EXPORTS.
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-rdynamic")
endmacro()
Index: IRIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/IRIX.cmake,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C 2 -d -r1.14 -r1.14.4.1
*** IRIX.cmake 1 Feb 2008 14:57:41 -0000 1.14
--- IRIX.cmake 28 Jan 2010 21:47:43 -0000 1.14.4.1
***************
*** 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 ----
--- Windows-g77.cmake DELETED ---
--- NEW FILE: HP-UX-GNU-Fortran.cmake ---
include(Platform/HP-UX-GNU)
__hpux_compiler_gnu(Fortran)
Index: QNX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/QNX.cmake,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C 2 -d -r1.11 -r1.11.4.1
*** QNX.cmake 21 Feb 2008 16:41:10 -0000 1.11
--- QNX.cmake 28 Jan 2010 21:47:47 -0000 1.11.4.1
***************
*** 1,7 ****
SET(QNXNTO 1)
- # GCC is the default compiler on QNX 6.3.
- INCLUDE(Platform/gcc)
-
# The QNX GCC does not seem to have -isystem so remove the flag.
SET(CMAKE_INCLUDE_SYSTEM_FLAG_C)
--- 1,4 ----
***************
*** 16,22 ****
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 ----
--- NEW FILE: CYGWIN-GNU-Fortran.cmake ---
include(Platform/CYGWIN-GNU)
__cygwin_compiler_gnu(Fortran)
Index: Linux-Intel-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-C.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** Linux-Intel-C.cmake 9 Oct 2009 20:11:11 -0000 1.4.2.1
--- Linux-Intel-C.cmake 28 Jan 2010 21:47:44 -0000 1.4.2.2
***************
*** 1,8 ****
INCLUDE(Platform/Linux-Intel)
! IF(XIAR)
! # INTERPROCEDURAL_OPTIMIZATION
! SET(CMAKE_C_COMPILE_OPTIONS_IPO -ipo)
! SET(CMAKE_C_CREATE_STATIC_LIBRARY_IPO
! "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
! "${XIAR} -s <TARGET> ")
! ENDIF(XIAR)
--- 1,2 ----
INCLUDE(Platform/Linux-Intel)
! __linux_compiler_intel(C)
--- NEW FILE: AIX-GNU.cmake ---
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# This module is shared by multiple languages; use include blocker.
if(__AIX_COMPILER_GNU)
return()
endif()
set(__AIX_COMPILER_GNU 1)
macro(__aix_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G")
endmacro()
--- NEW FILE: SunOS-GNU-C.cmake ---
include(Platform/SunOS-GNU)
__sunos_compiler_gnu(C)
--- gcc.cmake DELETED ---
Index: syllable.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/syllable.cmake,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** syllable.cmake 16 Jan 2008 14:51:57 -0000 1.2
--- syllable.cmake 28 Jan 2010 21:47:49 -0000 1.2.4.1
***************
*** 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: Windows-icl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-icl.cmake,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** Windows-icl.cmake 9 Oct 2009 20:11:12 -0000 1.6.2.1
--- Windows-icl.cmake 28 Jan 2010 21:47:48 -0000 1.6.2.2
***************
*** 72,76 ****
# executable linker flags
SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
! SET (CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:YES")
SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug")
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
--- 72,80 ----
# executable linker flags
SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:")
! SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID})
! IF(NOT _MACHINE_ARCH_FLAG)
! SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
! ENDIF(NOT _MACHINE_ARCH_FLAG)
! SET (CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:YES /machine:${_MACHINE_ARCH_FLAG}")
SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug")
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
***************
*** 83,86 ****
--- 87,91 ----
SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
+
INCLUDE(Platform/Windows-Intel)
--- NEW FILE: Linux-PathScale-CXX.cmake ---
include(Platform/Linux-PathScale)
__linux_compiler_pathscale(CXX)
Index: Linux-GNU-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-GNU-Fortran.cmake,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** Linux-GNU-Fortran.cmake 17 Mar 2008 12:55:04 -0000 1.2
--- Linux-GNU-Fortran.cmake 28 Jan 2010 21:47:44 -0000 1.2.2.1
***************
*** 1,16 ****
! SET(CMAKE_Fortran_MODDIR_FLAG -J)
! SET (CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC") # -pic
! SET (CMAKE_Fortran_FLAGS_INIT "")
! SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
! SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os")
! SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3")
! SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
!
! IF(NOT APPLE)
! SET (CMAKE_INCLUDE_SYSTEM_FLAG_Fortran "-isystem ")
! ENDIF(NOT APPLE)
!
! # These will require updates to CMake C++ code to support
! # preprocessing rules for Fortran.
! #SET (CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
! #SET (CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
--- 1,2 ----
! INCLUDE(Platform/Linux-GNU)
! __linux_compiler_gnu(Fortran)
--- NEW FILE: Windows-GNU-Fortran.cmake ---
include(Platform/Windows-GNU)
__windows_compiler_gnu(Fortran)
Index: CYGWIN.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/CYGWIN.cmake,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C 2 -d -r1.21 -r1.21.2.1
*** CYGWIN.cmake 27 May 2009 15:33:29 -0000 1.21
--- CYGWIN.cmake 28 Jan 2010 21:47:43 -0000 1.21.2.1
***************
*** 2,9 ****
SET(CYGWIN 1)
- SET(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--enable-auto-import")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,--export-all-symbols -Wl,--enable-auto-import")
- SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
- SET(CMAKE_DL_LIBS "-lgdi32" )
SET(CMAKE_SHARED_LIBRARY_PREFIX "cyg")
SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
--- 2,5 ----
***************
*** 12,55 ****
SET(CMAKE_IMPORT_LIBRARY_PREFIX "lib")
SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".dll.a")
- # no pic for gcc on cygwin
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "")
- SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
SET(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe
- SET(CMAKE_CREATE_WIN32_EXE "-mwindows")
# Modules have a different default prefix that shared libs.
SET(CMAKE_MODULE_EXISTS 1)
! SET(CMAKE_FIND_LIBRARY_PREFIXES "cyg" "lib")
! SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".dll.a" ".a")
!
! SET(CMAKE_GNULD_IMAGE_VERSION
! "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
!
! SET(CMAKE_C_CREATE_SHARED_MODULE
! "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_MODULE_CREATE_C_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
! SET(CMAKE_CXX_CREATE_SHARED_MODULE
! "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
!
! SET(CMAKE_C_CREATE_SHARED_LIBRARY
! "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
! SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
! "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
!
! SET(CMAKE_C_LINK_EXECUTABLE
! "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
! SET(CMAKE_CXX_LINK_EXECUTABLE
! "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
# Shared libraries on cygwin can be named with their version number.
SET(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1)
- # 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 "-Wl,-Bstatic")
- SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
- ENDFOREACH(type)
-
INCLUDE(Platform/UnixPaths)
--- 8,20 ----
SET(CMAKE_IMPORT_LIBRARY_PREFIX "lib")
SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".dll.a")
SET(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe
# Modules have a different default prefix that shared libs.
SET(CMAKE_MODULE_EXISTS 1)
! SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
! SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a")
# Shared libraries on cygwin can be named with their version number.
SET(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1)
INCLUDE(Platform/UnixPaths)
--- NEW FILE: HP-UX-GNU-CXX.cmake ---
include(Platform/HP-UX-GNU)
__hpux_compiler_gnu(CXX)
Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C 2 -d -r1.14.2.1 -r1.14.2.2
*** UnixPaths.cmake 9 Oct 2009 20:11:12 -0000 1.14.2.1
--- UnixPaths.cmake 28 Jan 2010 21:47:48 -0000 1.14.2.2
***************
*** 34,38 ****
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
! /usr/local / /usr
# CMake install location
--- 34,38 ----
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
! /usr/local /usr /
# CMake install location
Index: Linux-Intel.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** Linux-Intel.cmake 9 Oct 2009 20:11:12 -0000 1.1.2.1
--- Linux-Intel.cmake 28 Jan 2010 21:47:44 -0000 1.1.2.2
***************
*** 1,2 ****
--- 1,22 ----
+
+ #=============================================================================
+ # Copyright 2002-2009 Kitware, Inc.
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
+ # (To distributed this file outside of CMake, substitute the full
+ # License text for the above reference.)
+
+ # This module is shared by multiple languages; use include blocker.
+ if(__LINUX_COMPILER_INTEL)
+ return()
+ endif()
+ set(__LINUX_COMPILER_INTEL 1)
+
if(NOT XIAR)
set(_intel_xiar_hints)
***************
*** 10,11 ****
--- 30,48 ----
mark_as_advanced(XIAR)
endif(NOT XIAR)
+
+ macro(__linux_compiler_intel lang)
+ set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
+
+ # We pass this for historical reasons. Projects may have
+ # executables that use dlopen but do not set ENABLE_EXPORTS.
+ set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-rdynamic")
+
+ if(XIAR)
+ # INTERPROCEDURAL_OPTIMIZATION
+ set(CMAKE_${lang}_COMPILE_OPTIONS_IPO -ipo)
+ set(CMAKE_${lang}_CREATE_STATIC_LIBRARY_IPO
+ "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
+ "${XIAR} -s <TARGET> ")
+ endif()
+ endmacro()
--- g77.cmake DELETED ---
--- NEW FILE: CYGWIN-GNU-C.cmake ---
include(Platform/CYGWIN-GNU)
__cygwin_compiler_gnu(C)
--- CYGWIN-g77.cmake DELETED ---
Index: Linux-PGI-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-PGI-C.cmake,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C 2 -d -r1.2 -r1.2.4.1
*** Linux-PGI-C.cmake 27 Feb 2008 19:31:09 -0000 1.2
--- Linux-PGI-C.cmake 28 Jan 2010 21:47:44 -0000 1.2.4.1
***************
*** 1,5 ****
! SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
!
! 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>")
!
--- 1,2 ----
! include(Platform/Linux-PGI)
! __linux_compiler_pgi(C)
More information about the Cmake-commits
mailing list