[Cmake-commits] [cmake-commits] hoffman committed Linux-Intel-C.cmake 1.4 1.4.2.1 Linux-Intel-CXX.cmake 1.6 1.6.2.1 Linux-Intel-Fortran.cmake 1.3 1.3.2.1 Linux-Intel.cmake 1.1 1.1.2.1 UnixPaths.cmake 1.14 1.14.2.1 Windows-Borland-C.cmake NONE 1.1.2.2 Windows-Borland-CXX.cmake NONE 1.1.2.2 Windows-Borland.cmake NONE 1.1.2.2 Windows-bcc32.cmake 1.47 NONE Windows-icl.cmake 1.6 1.6.2.1 WindowsPaths.cmake 1.6 1.6.2.1 kFreeBSD.cmake 1.4 1.4.4.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 9 16:11:14 EDT 2009
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv13963/Modules/Platform
Modified Files:
Tag: CMake-2-8
Linux-Intel-C.cmake Linux-Intel-CXX.cmake
Linux-Intel-Fortran.cmake Linux-Intel.cmake UnixPaths.cmake
Windows-icl.cmake WindowsPaths.cmake kFreeBSD.cmake
Added Files:
Tag: CMake-2-8
Windows-Borland-C.cmake Windows-Borland-CXX.cmake
Windows-Borland.cmake
Removed Files:
Tag: CMake-2-8
Windows-bcc32.cmake
Log Message:
Merge in changes for RC 3
--- NEW FILE: Windows-Borland-CXX.cmake ---
include(Platform/Windows-Borland)
__borland_language(CXX)
--- NEW FILE: Windows-Borland-C.cmake ---
include(Platform/Windows-Borland)
__borland_language(C)
Index: Linux-Intel-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-Fortran.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** Linux-Intel-Fortran.cmake 1 Sep 2009 17:55:13 -0000 1.3
--- Linux-Intel-Fortran.cmake 9 Oct 2009 20:11:12 -0000 1.3.2.1
***************
*** 1,5 ****
INCLUDE(Platform/Linux-Intel)
IF(XIAR)
! SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY
"${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
"${XIAR} -s <TARGET> ")
--- 1,7 ----
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> ")
Index: Linux-Intel.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Linux-Intel.cmake 1 Sep 2009 17:55:13 -0000 1.1
--- Linux-Intel.cmake 9 Oct 2009 20:11:12 -0000 1.1.2.1
***************
*** 1,11 ****
if(NOT XIAR)
! set(_intel_xair_hints)
foreach(lang C CXX Fortran)
if(IS_ABSOLUTE "${CMAKE_${lang}_COMPILER}")
get_filename_component(_hint "${CMAKE_${lang}_COMPILER}" PATH)
! list(APPEND _intel_xair_hints ${_hint})
endif()
endforeach()
! find_program(XIAR NAMES xiar HINTS ${_intel_xair_hints})
mark_as_advanced(XIAR)
endif(NOT XIAR)
--- 1,11 ----
if(NOT XIAR)
! set(_intel_xiar_hints)
foreach(lang C CXX Fortran)
if(IS_ABSOLUTE "${CMAKE_${lang}_COMPILER}")
get_filename_component(_hint "${CMAKE_${lang}_COMPILER}" PATH)
! list(APPEND _intel_xiar_hints ${_hint})
endif()
endforeach()
! find_program(XIAR NAMES xiar HINTS ${_intel_xiar_hints})
mark_as_advanced(XIAR)
endif(NOT XIAR)
--- NEW FILE: Windows-Borland.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_BORLAND)
return()
endif()
set(__WINDOWS_BORLAND 1)
SET(BORLAND 1)
# Borland target type flags (bcc32 -h -t):
# -tW GUI App (implies -U__CONSOLE__)
# -tWC Console App (implies -D__CONSOLE__=1)
# -tWD Build a DLL (implies -D__DLL__=1 -D_DLL=1)
# -tWM Enable threads (implies -D__MT__=1 -D_MT=1)
# -tWR Use DLL runtime (implies -D_RTLDLL, and '-tW' too!!)
#
# Notes:
# - The flags affect linking so we pass them to the linker.
# - The flags affect preprocessing so we pass them to the compiler.
# - Since '-tWR' implies '-tW' we use '-tWR -tW-' instead.
# - Since '-tW-' disables '-tWD' we use '-tWR -tW- -tWD' for DLLs.
set(_RTLDLL "-tWR -tW-")
set(_COMPILE_C "-c")
set(_COMPILE_CXX "-P -c")
SET(CMAKE_LIBRARY_PATH_FLAG "-L")
SET(CMAKE_LINK_LIBRARY_FLAG "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES "-bcc.lib" ".lib")
# uncomment these out to debug makefiles
#SET(CMAKE_START_TEMP_FILE "")
#SET(CMAKE_END_TEMP_FILE "")
#SET(CMAKE_VERBOSE_MAKEFILE 1)
# Borland cannot handle + in the file name, so mangle object file name
SET (CMAKE_MANGLE_OBJECT_FILE_NAMES "ON")
# extra flags for a win32 exe
SET(CMAKE_CREATE_WIN32_EXE "-tW" )
# extra flags for a console app
SET(CMAKE_CREATE_CONSOLE_EXE "-tWC" )
SET (CMAKE_BUILD_TYPE Debug CACHE STRING
"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel.")
SET (CMAKE_EXE_LINKER_FLAGS_INIT "-tWM -lS:10000000 -lSc:10000000 ")
SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "-v")
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "-v")
SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT})
SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT})
SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT})
SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT})
SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT})
macro(__borland_language lang)
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-tWD")
# compile a source file into an object file
# place <DEFINES> outside the response file because Borland refuses
# to parse quotes from the response file.
set(CMAKE_${lang}_COMPILE_OBJECT
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} <DEFINES> ${CMAKE_START_TEMP_FILE}-DWIN32 -o<OBJECT> <FLAGS> ${_COMPILE_${lang}} <SOURCE>${CMAKE_END_TEMP_FILE}"
)
set(CMAKE_${lang}_LINK_EXECUTABLE
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} -e<TARGET> ${CMAKE_START_TEMP_FILE}<LINK_FLAGS> <FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
# "implib -c -w <TARGET_IMPLIB> <TARGET>"
)
# place <DEFINES> outside the response file because Borland refuses
# to parse quotes from the response file.
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE
"cpp32 <DEFINES> ${CMAKE_START_TEMP_FILE}-DWIN32 <FLAGS> -o<PREPROCESSED_SOURCE> ${_COMPILE_${lang}} <SOURCE>${CMAKE_END_TEMP_FILE}"
)
# Borland >= 5.6 allows -P option for cpp32, <= 5.5 does not
# Create a module library.
set(CMAKE_${lang}_CREATE_SHARED_MODULE
"<CMAKE_${lang}_COMPILER> ${_RTLDLL} -tWD ${CMAKE_START_TEMP_FILE}-e<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
)
# Create an import library for another target.
set(CMAKE_${lang}_CREATE_IMPORT_LIBRARY
"implib -c -w <TARGET_IMPLIB> <TARGET>"
)
# Create a shared library.
# First create a module and then its import library.
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
${CMAKE_${lang}_CREATE_SHARED_MODULE}
${CMAKE_${lang}_CREATE_IMPORT_LIBRARY}
)
# create a static library
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
"tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET_QUOTED> <OBJECTS>${CMAKE_END_TEMP_FILE}"
)
# Initial configuration flags.
set(CMAKE_${lang}_FLAGS_INIT "-tWM")
set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-Od -v")
set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-O1 -DNDEBUG")
set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O2 -DNDEBUG")
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-Od")
set(CMAKE_${lang}_STANDARD_LIBRARIES_INIT "import32.lib")
endmacro()
Index: Windows-icl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-icl.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** Windows-icl.cmake 1 Sep 2009 20:33:50 -0000 1.6
--- Windows-icl.cmake 9 Oct 2009 20:11:12 -0000 1.6.2.1
***************
*** 9,13 ****
# create a shared C++ library
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
! "xilink ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out:<TARGET> /dll <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
--- 9,13 ----
# create a shared C++ library
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
! "xilink ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /dll <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
***************
*** 36,45 ****
SET(CMAKE_C_LINK_EXECUTABLE
! "<CMAKE_C_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
SET(CMAKE_CXX_LINK_EXECUTABLE
! "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
--- 36,51 ----
SET(CMAKE_C_LINK_EXECUTABLE
! "<CMAKE_C_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
!
! SET(CMAKE_C_CREATE_PREPROCESSED_SOURCE
! "<CMAKE_C_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}")
!
! SET(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE
! "<CMAKE_CXX_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} <FLAGS> <DEFINES> /TP -E <SOURCE>${CMAKE_END_TEMP_FILE}")
SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
SET(CMAKE_CXX_LINK_EXECUTABLE
! "<CMAKE_CXX_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> <OBJECTS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
Index: Linux-Intel-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-CXX.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** Linux-Intel-CXX.cmake 1 Sep 2009 17:55:13 -0000 1.6
--- Linux-Intel-CXX.cmake 9 Oct 2009 20:11:12 -0000 1.6.2.1
***************
*** 1,5 ****
INCLUDE(Platform/Linux-Intel)
IF(XIAR)
! SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
"${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
"${XIAR} -s <TARGET> ")
--- 1,7 ----
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> ")
Index: Linux-Intel-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-C.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** Linux-Intel-C.cmake 1 Sep 2009 17:55:13 -0000 1.4
--- Linux-Intel-C.cmake 9 Oct 2009 20:11:11 -0000 1.4.2.1
***************
*** 1,5 ****
INCLUDE(Platform/Linux-Intel)
IF(XIAR)
! SET(CMAKE_C_CREATE_STATIC_LIBRARY
"${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
"${XIAR} -s <TARGET> ")
--- 1,7 ----
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> ")
Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** WindowsPaths.cmake 17 Dec 2008 14:23:30 -0000 1.6
--- WindowsPaths.cmake 9 Oct 2009 20:11:12 -0000 1.6.2.1
***************
*** 1,2 ****
--- 1,26 ----
+
+ #=============================================================================
+ # Copyright 2006-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.)
+
+ # Block multiple inclusion because "CMakeCInformation.cmake" includes
+ # "Platform/${CMAKE_SYSTEM_NAME}" even though the generic module
+ # "CMakeSystemSpecificInformation.cmake" already included it.
+ # The extra inclusion is a work-around documented next to the include()
+ # call, so this can be removed when the work-around is removed.
+ IF(__WINDOWS_PATHS_INCLUDED)
+ RETURN()
+ ENDIF()
+ SET(__WINDOWS_PATHS_INCLUDED 1)
+
# Add the program-files folder(s) to the list of installation
# prefixes.
Index: kFreeBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/kFreeBSD.cmake,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C 2 -d -r1.4 -r1.4.4.1
*** kFreeBSD.cmake 2 Feb 2008 13:58:53 -0000 1.4
--- kFreeBSD.cmake 9 Oct 2009 20:11:12 -0000 1.4.4.1
***************
*** 1,12 ****
# kFreeBSD looks just like 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,")
!
! INCLUDE(Platform/UnixPaths)
--- 1,2 ----
# kFreeBSD looks just like Linux.
! INCLUDE(Platform/Linux)
Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C 2 -d -r1.14 -r1.14.2.1
*** UnixPaths.cmake 25 Feb 2009 16:44:46 -0000 1.14
--- UnixPaths.cmake 9 Oct 2009 20:11:12 -0000 1.14.2.1
***************
*** 1,2 ****
--- 1,26 ----
+
+ #=============================================================================
+ # Copyright 2006-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.)
+
+ # Block multiple inclusion because "CMakeCInformation.cmake" includes
+ # "Platform/${CMAKE_SYSTEM_NAME}" even though the generic module
+ # "CMakeSystemSpecificInformation.cmake" already included it.
+ # The extra inclusion is a work-around documented next to the include()
+ # call, so this can be removed when the work-around is removed.
+ IF(__UNIX_PATHS_INCLUDED)
+ RETURN()
+ ENDIF()
+ SET(__UNIX_PATHS_INCLUDED 1)
+
SET(UNIX 1)
***************
*** 10,14 ****
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
! / /usr /usr/local
# CMake install location
--- 34,38 ----
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
! /usr/local / /usr
# CMake install location
--- Windows-bcc32.cmake DELETED ---
More information about the Cmake-commits
mailing list