reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-27 07:27:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'CrayPrgEnv-update-link-type-detection' into release-3.15

Browse Source 
Merge-request: !3716
This commit is contained in:
Brad King 2019-08-22 12:27:08 -04:00
commit d911f8fc12
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/3.15.rst
View File

@ -369,3 +369,10 @@ Changes made since CMake 3.15.0 include the following.
* In CMake 3.15.0 and 3.15.1 the :variable:`CMAKE_FIND_PACKAGE_PREFER_CONFIG` * In CMake 3.15.0 and 3.15.1 the :variable:`CMAKE_FIND_PACKAGE_PREFER_CONFIG`
variable caused the :command:`find_package` command to fail on a missing variable caused the :command:`find_package` command to fail on a missing
package even without the ``REQUIRED`` option. This has been fixed. package even without the ``REQUIRED`` option. This has been fixed.
3.15.3
------
* ``CrayPrgEnv`` compiler wrapper support has been updated for the 19.06
release of the Cray Programming Environment for which the default linking
mode on XC Cray systems is now dynamic instead of static.

20
Modules/Compiler/CrayPrgEnv.cmake
View File

@ -69,13 +69,27 @@ endfunction()
# note that cmake applies both CMAKE_${lang}_FLAGS and CMAKE_EXE_LINKER_FLAGS # note that cmake applies both CMAKE_${lang}_FLAGS and CMAKE_EXE_LINKER_FLAGS
# (in that order) to the linking command, so -dynamic can appear in either # (in that order) to the linking command, so -dynamic can appear in either
# variable. # variable.
#
# Note: As of CrayPE v19.06 (which translates to the craype/2.6.0 module)
# the default has changed and is now dynamic by default. This is handled
# accordingly
function(__cmake_craype_linktype lang rv) function(__cmake_craype_linktype lang rv)
# start with ENV, but allow flags to override # start with ENV, but allow flags to override
if("$ENV{CRAYPE_LINK_TYPE}" STREQUAL "dynamic") if(("$ENV{CRAYPE_VERSION}" STREQUAL "") OR
set(linktype dynamic) ("$ENV{CRAYPE_VERSION}" VERSION_LESS "2.6"))
if("$ENV{CRAYPE_LINK_TYPE}" STREQUAL "dynamic")
set(linktype dynamic)
else()
set(linktype static)
endif()
else() else()
set(linktype static) if("$ENV{CRAYPE_LINK_TYPE}" STREQUAL "static")
set(linktype static)
else()
set(linktype dynamic)
endif()
endif() endif()
# combine flags and convert to a list so we can apply the flags in order # combine flags and convert to a list so we can apply the flags in order
set(linkflags "${CMAKE_${lang}_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") set(linkflags "${CMAKE_${lang}_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
string(REPLACE " " ";" linkflags "${linkflags}") string(REPLACE " " ";" linkflags "${linkflags}")