From ef8aa19c33e83ff019595fd7f8fdc29c35c336a3 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 13 Feb 2013 18:21:12 -0800 Subject: Imported Upstream version 2.8.10.2 --- Modules/Compiler/Absoft-Fortran.cmake | 16 ++++++------- Modules/Compiler/Clang-ASM.cmake | 5 ++++ Modules/Compiler/Clang-C.cmake | 3 ++- Modules/Compiler/Clang-CXX.cmake | 3 ++- Modules/Compiler/Clang.cmake | 26 +++++++++++++++++++++ Modules/Compiler/GNU-Fortran.cmake | 10 ++++---- Modules/Compiler/GNU.cmake | 6 ++--- Modules/Compiler/HP-ASM.cmake | 2 +- Modules/Compiler/HP-C.cmake | 6 ++--- Modules/Compiler/HP-CXX.cmake | 6 ++--- Modules/Compiler/HP-Fortran.cmake | 2 +- Modules/Compiler/Intel-ASM.cmake | 22 +++++++++--------- Modules/Compiler/Intel-C.cmake | 16 ++++++------- Modules/Compiler/Intel-CXX.cmake | 16 ++++++------- Modules/Compiler/Intel-Fortran.cmake | 14 +++++------ Modules/Compiler/MIPSpro-C.cmake | 2 +- Modules/Compiler/MIPSpro-CXX.cmake | 2 +- Modules/Compiler/MIPSpro-Fortran.cmake | 2 +- Modules/Compiler/PGI-Fortran.cmake | 10 ++++---- Modules/Compiler/PathScale-Fortran.cmake | 2 +- Modules/Compiler/SunPro-ASM.cmake | 30 ++++++++++++------------ Modules/Compiler/SunPro-C.cmake | 38 +++++++++++++++--------------- Modules/Compiler/SunPro-CXX.cmake | 40 ++++++++++++++++---------------- Modules/Compiler/SunPro-Fortran.cmake | 26 ++++++++++----------- Modules/Compiler/TinyCC-C.cmake | 12 +++++----- Modules/Compiler/XL-ASM.cmake | 14 +++++------ Modules/Compiler/XL-C.cmake | 2 +- Modules/Compiler/XL-CXX.cmake | 4 ++-- Modules/Compiler/XL-Fortran.cmake | 10 ++++---- 29 files changed, 190 insertions(+), 157 deletions(-) create mode 100644 Modules/Compiler/Clang-ASM.cmake create mode 100644 Modules/Compiler/Clang.cmake (limited to 'Modules/Compiler') diff --git a/Modules/Compiler/Absoft-Fortran.cmake b/Modules/Compiler/Absoft-Fortran.cmake index 1bb7b1f82..2e1666fbf 100644 --- a/Modules/Compiler/Absoft-Fortran.cmake +++ b/Modules/Compiler/Absoft-Fortran.cmake @@ -1,10 +1,10 @@ -SET(CMAKE_Fortran_FLAGS_INIT "") -SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "") -SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3") -SET(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") -SET(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") -SET(CMAKE_Fortran_MODPATH_FLAG "-p") -SET(CMAKE_Fortran_VERBOSE_FLAG "-v") +set(CMAKE_Fortran_FLAGS_INIT "") +set(CMAKE_Fortran_FLAGS_DEBUG_INIT "-g") +set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "") +set(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3") +set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") +set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") +set(CMAKE_Fortran_MODPATH_FLAG "-p") +set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree") diff --git a/Modules/Compiler/Clang-ASM.cmake b/Modules/Compiler/Clang-ASM.cmake new file mode 100644 index 000000000..16c9c159c --- /dev/null +++ b/Modules/Compiler/Clang-ASM.cmake @@ -0,0 +1,5 @@ +include(Compiler/Clang) + +set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S;asm) + +__compiler_clang(ASM) diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake index f7baf686a..98fcd0b3f 100644 --- a/Modules/Compiler/Clang-C.cmake +++ b/Modules/Compiler/Clang-C.cmake @@ -1 +1,2 @@ -include(Compiler/GNU-C) +include(Compiler/Clang) +__compiler_clang(C) diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index d3c403a69..486e2af88 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -1 +1,2 @@ -include(Compiler/GNU-CXX) +include(Compiler/Clang) +__compiler_clang(CXX) diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake new file mode 100644 index 000000000..75a971dd7 --- /dev/null +++ b/Modules/Compiler/Clang.cmake @@ -0,0 +1,26 @@ + +#============================================================================= +# Copyright 2002-2012 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 distribute 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(__COMPILER_CLANG) + return() +endif() +set(__COMPILER_CLANG 1) + +include(Compiler/GNU) + +macro(__compiler_clang lang) + __compiler_gnu(${lang}) + set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") +endmacro() diff --git a/Modules/Compiler/GNU-Fortran.cmake b/Modules/Compiler/GNU-Fortran.cmake index c710e8698..313ccbd02 100644 --- a/Modules/Compiler/GNU-Fortran.cmake +++ b/Modules/Compiler/GNU-Fortran.cmake @@ -5,13 +5,13 @@ set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form") # No -DNDEBUG for Fortran. -SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os") -SET(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3") +set(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os") +set(CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3") # We require updates to CMake C++ code to support preprocessing rules # for Fortran. -SET(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) -SET(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) +set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) +set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) # Fortran-specific feature flags. -SET(CMAKE_Fortran_MODDIR_FLAG -J) +set(CMAKE_Fortran_MODDIR_FLAG -J) diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index 6aecf90e8..faad41672 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -32,7 +32,7 @@ macro(__compiler_gnu lang) # header file as a warning if depfiles are enabled, causing check_header_file # tests to always succeed. Work around this by disabling dependency tracking # in try_compile mode. - GET_PROPERTY(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE) + get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE) if(NOT _IN_TC OR CMAKE_FORCE_DEPFILES) # distcc does not transform -o to -MT when invoking the preprocessor # internally, as it ought to. Work around this bug by setting -MT here @@ -45,10 +45,10 @@ macro(__compiler_gnu lang) set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g") set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") set(CMAKE_${lang}_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") - set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") if(NOT APPLE) set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") - endif(NOT APPLE) + endif() endmacro() diff --git a/Modules/Compiler/HP-ASM.cmake b/Modules/Compiler/HP-ASM.cmake index 8aa7bdb7d..b60f207b4 100644 --- a/Modules/Compiler/HP-ASM.cmake +++ b/Modules/Compiler/HP-ASM.cmake @@ -1,3 +1,3 @@ -SET(CMAKE_ASM_VERBOSE_FLAG "-v") +set(CMAKE_ASM_VERBOSE_FLAG "-v") set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s ) diff --git a/Modules/Compiler/HP-C.cmake b/Modules/Compiler/HP-C.cmake index dc7fbb21d..6dddcbae1 100644 --- a/Modules/Compiler/HP-C.cmake +++ b/Modules/Compiler/HP-C.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_C_VERBOSE_FLAG "-v") +set(CMAKE_C_VERBOSE_FLAG "-v") -SET(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") -SET(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") diff --git a/Modules/Compiler/HP-CXX.cmake b/Modules/Compiler/HP-CXX.cmake index 82c1a861e..44470cae0 100644 --- a/Modules/Compiler/HP-CXX.cmake +++ b/Modules/Compiler/HP-CXX.cmake @@ -1,4 +1,4 @@ -SET(CMAKE_CXX_VERBOSE_FLAG "-v") +set(CMAKE_CXX_VERBOSE_FLAG "-v") -SET(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") -SET(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") diff --git a/Modules/Compiler/HP-Fortran.cmake b/Modules/Compiler/HP-Fortran.cmake index 04fb96ea4..cc56b4611 100644 --- a/Modules/Compiler/HP-Fortran.cmake +++ b/Modules/Compiler/HP-Fortran.cmake @@ -1,3 +1,3 @@ -SET(CMAKE_Fortran_VERBOSE_FLAG "-v") +set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "+source=fixed") set(CMAKE_Fortran_FORMAT_FREE_FLAG "+source=free") diff --git a/Modules/Compiler/Intel-ASM.cmake b/Modules/Compiler/Intel-ASM.cmake index 59b50a15c..74ceb0a6a 100644 --- a/Modules/Compiler/Intel-ASM.cmake +++ b/Modules/Compiler/Intel-ASM.cmake @@ -1,13 +1,13 @@ -SET(CMAKE_ASM_VERBOSE_FLAG "-v") +set(CMAKE_ASM_VERBOSE_FLAG "-v") -SET(CMAKE_ASM_FLAGS_INIT "") -SET(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -SET(CMAKE_ASM_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") -SET(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") +set(CMAKE_ASM_FLAGS_INIT "") +set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") +set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") -IF(UNIX) - SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S) -ELSE(UNIX) - SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm) -ENDIF(UNIX) +if(UNIX) + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S) +else() + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm) +endif() diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake index 4be91d084..e23317c14 100644 --- a/Modules/Compiler/Intel-C.cmake +++ b/Modules/Compiler/Intel-C.cmake @@ -1,10 +1,10 @@ -SET(CMAKE_C_VERBOSE_FLAG "-v") +set(CMAKE_C_VERBOSE_FLAG "-v") -SET(CMAKE_C_FLAGS_INIT "") -SET(CMAKE_C_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -SET(CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") -SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") +set(CMAKE_C_FLAGS_INIT "") +set(CMAKE_C_FLAGS_DEBUG_INIT "-g") +set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") +set(CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") +set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") -SET(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") -SET(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index ff01a81f6..ae6021a68 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -1,10 +1,10 @@ -SET(CMAKE_CXX_VERBOSE_FLAG "-v") +set(CMAKE_CXX_VERBOSE_FLAG "-v") -SET(CMAKE_CXX_FLAGS_INIT "") -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") -SET(CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") -SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") +set(CMAKE_CXX_FLAGS_INIT "") +set(CMAKE_CXX_FLAGS_DEBUG_INIT "-g") +set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") -SET(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") -SET(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") diff --git a/Modules/Compiler/Intel-Fortran.cmake b/Modules/Compiler/Intel-Fortran.cmake index 467abdcf5..84f6182a7 100644 --- a/Modules/Compiler/Intel-Fortran.cmake +++ b/Modules/Compiler/Intel-Fortran.cmake @@ -1,9 +1,9 @@ -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") -SET(CMAKE_Fortran_MODDIR_FLAG "-module ") -SET(CMAKE_Fortran_VERBOSE_FLAG "-v") +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") +set(CMAKE_Fortran_MODDIR_FLAG "-module ") +set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free") diff --git a/Modules/Compiler/MIPSpro-C.cmake b/Modules/Compiler/MIPSpro-C.cmake index abf384ab8..675560c2a 100644 --- a/Modules/Compiler/MIPSpro-C.cmake +++ b/Modules/Compiler/MIPSpro-C.cmake @@ -1 +1 @@ -SET(CMAKE_C_VERBOSE_FLAG "-v") +set(CMAKE_C_VERBOSE_FLAG "-v") diff --git a/Modules/Compiler/MIPSpro-CXX.cmake b/Modules/Compiler/MIPSpro-CXX.cmake index f3c6b5f82..9fb191c75 100644 --- a/Modules/Compiler/MIPSpro-CXX.cmake +++ b/Modules/Compiler/MIPSpro-CXX.cmake @@ -1 +1 @@ -SET(CMAKE_CXX_VERBOSE_FLAG "-v") +set(CMAKE_CXX_VERBOSE_FLAG "-v") diff --git a/Modules/Compiler/MIPSpro-Fortran.cmake b/Modules/Compiler/MIPSpro-Fortran.cmake index 9220d3bf0..ffceea80d 100644 --- a/Modules/Compiler/MIPSpro-Fortran.cmake +++ b/Modules/Compiler/MIPSpro-Fortran.cmake @@ -1,3 +1,3 @@ -SET(CMAKE_Fortran_VERBOSE_FLAG "-v") +set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixedform") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-freeform") diff --git a/Modules/Compiler/PGI-Fortran.cmake b/Modules/Compiler/PGI-Fortran.cmake index aebc7b1c2..264c23e74 100644 --- a/Modules/Compiler/PGI-Fortran.cmake +++ b/Modules/Compiler/PGI-Fortran.cmake @@ -4,12 +4,12 @@ __compiler_pgi(Fortran) set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-Mnofreeform") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-Mfreeform") -SET(CMAKE_Fortran_FLAGS_INIT "${CMAKE_Fortran_FLAGS_INIT} -Mpreprocess -Kieee") -SET(CMAKE_Fortran_FLAGS_DEBUG_INIT "${CMAKE_Fortran_FLAGS_DEBUG_INIT} -Mbounds") +set(CMAKE_Fortran_FLAGS_INIT "${CMAKE_Fortran_FLAGS_INIT} -Mpreprocess -Kieee") +set(CMAKE_Fortran_FLAGS_DEBUG_INIT "${CMAKE_Fortran_FLAGS_DEBUG_INIT} -Mbounds") # We require updates to CMake C++ code to support preprocessing rules # for Fortran. -SET(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) -SET(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) +set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) +set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) -SET(CMAKE_Fortran_MODDIR_FLAG "-module ") +set(CMAKE_Fortran_MODDIR_FLAG "-module ") diff --git a/Modules/Compiler/PathScale-Fortran.cmake b/Modules/Compiler/PathScale-Fortran.cmake index e05bf2afc..d90362104 100644 --- a/Modules/Compiler/PathScale-Fortran.cmake +++ b/Modules/Compiler/PathScale-Fortran.cmake @@ -1,6 +1,6 @@ include(Compiler/PathScale) __compiler_pathscale(Fortran) -SET(CMAKE_Fortran_MODDIR_FLAG "-module ") +set(CMAKE_Fortran_MODDIR_FLAG "-module ") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixedform") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-freeform") diff --git a/Modules/Compiler/SunPro-ASM.cmake b/Modules/Compiler/SunPro-ASM.cmake index dfc5702ee..2fa8b9950 100644 --- a/Modules/Compiler/SunPro-ASM.cmake +++ b/Modules/Compiler/SunPro-ASM.cmake @@ -1,24 +1,24 @@ set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s ) -SET(CMAKE_ASM_VERBOSE_FLAG "-#") +set(CMAKE_ASM_VERBOSE_FLAG "-#") -SET(CMAKE_SHARED_LIBRARY_ASM_FLAGS "-KPIC") -SET(CMAKE_SHARED_LIBRARY_CREATE_ASM_FLAGS "-G") -SET(CMAKE_SHARED_LIBRARY_RUNTIME_ASM_FLAG "-R") -SET(CMAKE_SHARED_LIBRARY_RUNTIME_ASM_FLAG_SEP ":") -SET(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG "-h") +set(CMAKE_SHARED_LIBRARY_ASM_FLAGS "-KPIC") +set(CMAKE_SHARED_LIBRARY_CREATE_ASM_FLAGS "-G") +set(CMAKE_SHARED_LIBRARY_RUNTIME_ASM_FLAG "-R") +set(CMAKE_SHARED_LIBRARY_RUNTIME_ASM_FLAG_SEP ":") +set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG "-h") -SET(CMAKE_ASM_FLAGS_INIT "") -SET(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG") -SET(CMAKE_ASM_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG") -SET(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-g -xO2") +set(CMAKE_ASM_FLAGS_INIT "") +set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") +set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-xO2 -xspace -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELEASE_INIT "-xO3 -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-g -xO2 -DNDEBUG") # Initialize ASM 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_ASM_FLAGS "-Bstatic") - SET(CMAKE_${type}_LINK_DYNAMIC_ASM_FLAGS "-Bdynamic") -ENDFOREACH(type) +foreach(type SHARED_LIBRARY SHARED_MODULE EXE) + set(CMAKE_${type}_LINK_STATIC_ASM_FLAGS "-Bstatic") + set(CMAKE_${type}_LINK_DYNAMIC_ASM_FLAGS "-Bdynamic") +endforeach() diff --git a/Modules/Compiler/SunPro-C.cmake b/Modules/Compiler/SunPro-C.cmake index a1a3ae118..c5b5203fd 100644 --- a/Modules/Compiler/SunPro-C.cmake +++ b/Modules/Compiler/SunPro-C.cmake @@ -1,27 +1,27 @@ -SET(CMAKE_C_VERBOSE_FLAG "-#") +set(CMAKE_C_VERBOSE_FLAG "-#") -SET(CMAKE_C_COMPILE_OPTIONS_PIC -KPIC) -SET(CMAKE_C_COMPILE_OPTIONS_PIE -KPIE) -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_C_COMPILE_OPTIONS_PIC -KPIC) +set(CMAKE_C_COMPILE_OPTIONS_PIE -KPIE) +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_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") +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 -DNDEBUG") # 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) +foreach(type SHARED_LIBRARY SHARED_MODULE EXE) + set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Bstatic") + set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic") +endforeach() -SET(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") -SET(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_C_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -S -o ") diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake index 702e42458..59687129a 100644 --- a/Modules/Compiler/SunPro-CXX.cmake +++ b/Modules/Compiler/SunPro-CXX.cmake @@ -1,33 +1,33 @@ -SET(CMAKE_CXX_VERBOSE_FLAG "-v") +set(CMAKE_CXX_VERBOSE_FLAG "-v") -SET(CMAKE_CXX_COMPILE_OPTIONS_PIC -KPIC) -SET(CMAKE_CXX_COMPILE_OPTIONS_PIE -KPIE) -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 ":") -SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h") +set(CMAKE_CXX_COMPILE_OPTIONS_PIC -KPIC) +set(CMAKE_CXX_COMPILE_OPTIONS_PIE -KPIE) +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 ":") +set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h") -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") +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 -DNDEBUG") # 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) +foreach(type SHARED_LIBRARY SHARED_MODULE EXE) + set(CMAKE_${type}_LINK_STATIC_CXX_FLAGS "-Bstatic") + set(CMAKE_${type}_LINK_DYNAMIC_CXX_FLAGS "-Bdynamic") +endforeach() -SET(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") -SET(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") +set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE " -E > ") +set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -S -o ") # Create archives with "CC -xar" in case user adds "-instances=extern" # so that template instantiations are available to archive members. -SET(CMAKE_CXX_CREATE_STATIC_LIBRARY +set(CMAKE_CXX_CREATE_STATIC_LIBRARY " -xar -o " " ") diff --git a/Modules/Compiler/SunPro-Fortran.cmake b/Modules/Compiler/SunPro-Fortran.cmake index 86d6def34..18e75b9e3 100644 --- a/Modules/Compiler/SunPro-Fortran.cmake +++ b/Modules/Compiler/SunPro-Fortran.cmake @@ -1,18 +1,18 @@ -SET(CMAKE_Fortran_VERBOSE_FLAG "-v") +set(CMAKE_Fortran_VERBOSE_FLAG "-v") set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed") set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free") -SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-KPIC") -SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-G") -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_SHARED_LIBRARY_Fortran_FLAGS "-KPIC") +set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-G") +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_EXECUTABLE_RUNTIME_Fortran_FLAG "-R") -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") +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 -DNDEBUG") +set(CMAKE_Fortran_MODDIR_FLAG "-moddir=") +set(CMAKE_Fortran_MODPATH_FLAG "-M") diff --git a/Modules/Compiler/TinyCC-C.cmake b/Modules/Compiler/TinyCC-C.cmake index 4a48c0af5..f7937acdf 100644 --- a/Modules/Compiler/TinyCC-C.cmake +++ b/Modules/Compiler/TinyCC-C.cmake @@ -1,8 +1,8 @@ -SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") +set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # no optimization in tcc: -SET (CMAKE_C_FLAGS_INIT "") -SET (CMAKE_C_FLAGS_DEBUG_INIT "-g") -SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-DNDEBUG") -SET (CMAKE_C_FLAGS_RELEASE_INIT "-DNDEBUG") -SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-g") +set (CMAKE_C_FLAGS_INIT "") +set (CMAKE_C_FLAGS_DEBUG_INIT "-g") +set (CMAKE_C_FLAGS_MINSIZEREL_INIT "-DNDEBUG") +set (CMAKE_C_FLAGS_RELEASE_INIT "-DNDEBUG") +set (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-g -DNDEBUG") diff --git a/Modules/Compiler/XL-ASM.cmake b/Modules/Compiler/XL-ASM.cmake index e5d4ffa85..07507f9be 100644 --- a/Modules/Compiler/XL-ASM.cmake +++ b/Modules/Compiler/XL-ASM.cmake @@ -1,13 +1,13 @@ -SET(CMAKE_ASM_VERBOSE_FLAG "-V") +set(CMAKE_ASM_VERBOSE_FLAG "-V") # -qthreaded = Ensures that all optimizations will be thread-safe # -qalias=noansi = Turns off type-based aliasing completely (safer optimizer) # -qhalt=e = Halt on error messages (rather than just severe errors) -SET(CMAKE_ASM_FLAGS_INIT "-qthreaded -qalias=noansi -qhalt=e -qsourcetype=assembler") +set(CMAKE_ASM_FLAGS_INIT "-qthreaded -qalias=noansi -qhalt=e -qsourcetype=assembler") -SET(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") -SET(CMAKE_ASM_FLAGS_RELEASE_INIT "-O -DNDEBUG") -SET(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-O -DNDEBUG") -SET(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-g") +set(CMAKE_ASM_FLAGS_DEBUG_INIT "-g") +set(CMAKE_ASM_FLAGS_RELEASE_INIT "-O -DNDEBUG") +set(CMAKE_ASM_FLAGS_MINSIZEREL_INIT "-O -DNDEBUG") +set(CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT "-g -DNDEBUG") -SET(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s ) +set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s ) diff --git a/Modules/Compiler/XL-C.cmake b/Modules/Compiler/XL-C.cmake index ae869e37e..09a55291e 100644 --- a/Modules/Compiler/XL-C.cmake +++ b/Modules/Compiler/XL-C.cmake @@ -6,4 +6,4 @@ set(CMAKE_C_FLAGS_MINSIZEREL_INIT "${CMAKE_C_FLAGS_MINSIZEREL_INIT} -DNDEBUG") # -qthreaded = Ensures that all optimizations will be thread-safe # -qalias=noansi = Turns off type-based aliasing completely (safer optimizer) # -qhalt=e = Halt on error messages (rather than just severe errors) -SET(CMAKE_C_FLAGS_INIT "-qthreaded -qalias=noansi -qhalt=e") +set(CMAKE_C_FLAGS_INIT "-qthreaded -qalias=noansi -qhalt=e") diff --git a/Modules/Compiler/XL-CXX.cmake b/Modules/Compiler/XL-CXX.cmake index 29c4b5e37..6c842cd77 100644 --- a/Modules/Compiler/XL-CXX.cmake +++ b/Modules/Compiler/XL-CXX.cmake @@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT} -DNDEBUG # -qthreaded = Ensures that all optimizations will be thread-safe # -qhalt=e = Halt on error messages (rather than just severe errors) -SET(CMAKE_CXX_FLAGS_INIT "-qthreaded -qhalt=e") +set(CMAKE_CXX_FLAGS_INIT "-qthreaded -qhalt=e") -SET(CMAKE_CXX_COMPILE_OBJECT +set(CMAKE_CXX_COMPILE_OBJECT " -+ -o -c ") diff --git a/Modules/Compiler/XL-Fortran.cmake b/Modules/Compiler/XL-Fortran.cmake index e7026f11a..f1c9158b2 100644 --- a/Modules/Compiler/XL-Fortran.cmake +++ b/Modules/Compiler/XL-Fortran.cmake @@ -4,14 +4,14 @@ __compiler_xl(Fortran) set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-qfixed") # [=] set(CMAKE_Fortran_FORMAT_FREE_FLAG "-qfree") # [=f90|ibm] -SET(CMAKE_Fortran_MODDIR_FLAG "-qmoddir=") +set(CMAKE_Fortran_MODDIR_FLAG "-qmoddir=") -SET(CMAKE_Fortran_DEFINE_FLAG "-WF,-D") +set(CMAKE_Fortran_DEFINE_FLAG "-WF,-D") # -qthreaded = Ensures that all optimizations will be thread-safe # -qhalt=e = Halt on error messages (rather than just severe errors) -SET(CMAKE_Fortran_FLAGS_INIT "-qthreaded -qhalt=e") +set(CMAKE_Fortran_FLAGS_INIT "-qthreaded -qhalt=e") # We require updates to CMake C++ code to support preprocessing rules for Fortran. -SET(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) -SET(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) +set(CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE) +set(CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE) -- cgit v1.2.3