mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-15 11:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cray: Add common PIC flags

Browse Source 
Fixes #17208
This commit is contained in:
Chuck Atkins
2018-01-24 09:09:08 -06:00
parent c1e087a9d3
commit b886b46ccb
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Compiler/Cray-C.cmake
View File

@@ -2,8 +2,7 @@
# file Copyright.txt or https://cmake.org/licensing for details.
include(Compiler/Cray)
set(CMAKE_C_VERBOSE_FLAG "-v")
__compiler_cray(C)
string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -DNDEBUG")

3
Modules/Compiler/Cray-CXX.cmake
View File

@@ -2,8 +2,7 @@
# file Copyright.txt or https://cmake.org/licensing for details.
include(Compiler/Cray)
set(CMAKE_CXX_VERBOSE_FLAG "-v")
__compiler_cray(C)
string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -DNDEBUG")

7
Modules/Compiler/Cray-Fortran.cmake
View File

@@ -1,4 +1,9 @@
set(CMAKE_Fortran_VERBOSE_FLAG "-v")
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
include(Compiler/Cray)
__compiler_cray(Fortran)
set(CMAKE_Fortran_MODOUT_FLAG -em)
set(CMAKE_Fortran_MODDIR_FLAG -J)
set(CMAKE_Fortran_MODDIR_DEFAULT .)

7
Modules/Compiler/Cray.cmake
View File

@@ -8,3 +8,10 @@ endif()
set(__COMPILER_CRAY 1)
include(Compiler/CMakeCommonCompilerMacros)
macro(__compiler_cray lang)
set(CMAKE_${lang}_VERBOSE_FLAG "-v")
set(CMAKE_${lang}_COMPILE_OPTIONS_PIC -h PIC)
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE -h PIC)
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-h PIC")
endmacro()

3
Modules/Compiler/CrayPrgEnv.cmake
View File

@@ -62,12 +62,11 @@ macro(__CrayPrgEnv_setup lang test_src compiler_cmd link_cmd)
# Flags for the Cray wrappers
set(CMAKE_STATIC_LIBRARY_LINK_${lang}_FLAGS "-static")
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-dynamic")
# If the link type is not explicitly specified in the environment then
# the Cray wrappers assume that the code will be built staticly so
# the Cray wrappers assume that the code will be built statically so
# we check the following condition(s) are NOT met
# Compiler flags are explicitly dynamic
# Env var is dynamic and compiler flags are not explicitly static