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

CheckPIESupported: now uses any SYSROOT settings

Browse Source 
Fixes: 23053
This commit is contained in:
Marc Chevrier
2022-01-16 16:11:45 +01:00
parent 4fa105d34e
commit 219dde4ea8
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Help/release/dev/CheckPIESupported-supports-SYSROOT.rst Normal file
View File

@@ -0,0 +1,6 @@
CheckPIESupported-supports-SYSROOT
----------------------------------
* The :module:`CheckPIESupported` module now takes care of any ``SYSROOT``
settings and gains the support of ``OBJC``, ``OBJCXX``, ``CUDA``, and ``HIP``
languages.

26
Modules/CheckPIESupported.cmake
View File

@@ -25,7 +25,8 @@ property for executables will be honored at link time.
Set ``<output>`` variable with details about any error. Set ``<output>`` variable with details about any error.
``LANGUAGES <lang>...`` ``LANGUAGES <lang>...``
Check the linkers used for each of the specified languages. Check the linkers used for each of the specified languages.
Supported languages are ``C``, ``CXX``, and ``Fortran``. Supported languages are ``C``, ``CXX``, ``OBJC``, ``OBJCXX``, ``Fortran``,
``CUDA``, and ``HIP``.
It makes no sense to use this module when :policy:`CMP0083` is set to ``OLD``, It makes no sense to use this module when :policy:`CMP0083` is set to ``OLD``,
so the command will return an error in this case. See policy :policy:`CMP0083` so the command will return an error in this case. See policy :policy:`CMP0083`
@@ -62,7 +63,7 @@ Examples
#]=======================================================================] #]=======================================================================]
include (Internal/CMakeTryCompilerOrLinkerFlag) include (Internal/CheckLinkerFlag)
function (check_pie_supported) function (check_pie_supported)
cmake_policy(GET CMP0083 cmp0083) cmake_policy(GET CMP0083 cmp0083)
@@ -86,7 +87,7 @@ function (check_pie_supported)
if (CHECK_PIE_LANGUAGES) if (CHECK_PIE_LANGUAGES)
set (unsupported_languages "${CHECK_PIE_LANGUAGES}") set (unsupported_languages "${CHECK_PIE_LANGUAGES}")
list (REMOVE_ITEM unsupported_languages "C" "CXX" "Fortran") list (REMOVE_ITEM unsupported_languages "C" "CXX" "OBJC" "OBJCXX" "Fortran" "CUDA" "HIP")
if(unsupported_languages) if(unsupported_languages)
message(FATAL_ERROR "check_pie_supported: language(s) '${unsupported_languages}' not supported") message(FATAL_ERROR "check_pie_supported: language(s) '${unsupported_languages}' not supported")
endif() endif()
@@ -97,7 +98,7 @@ function (check_pie_supported)
return() return()
endif() endif()
list (FILTER enabled_languages INCLUDE REGEX "^(C|CXX|Fortran)$") list (FILTER enabled_languages INCLUDE REGEX "^(C|CXX|OBJC|OBJCXX|Fortran|CUDA|HIP)$")
if (NOT enabled_languages) if (NOT enabled_languages)
return() return()
endif() endif()
@@ -105,24 +106,29 @@ function (check_pie_supported)
set (CHECK_PIE_LANGUAGES ${enabled_languages}) set (CHECK_PIE_LANGUAGES ${enabled_languages})
endif() endif()
set(CMAKE_REQUIRED_QUIET TRUE)
set (outputs) set (outputs)
foreach(lang IN LISTS CHECK_PIE_LANGUAGES) foreach(lang IN LISTS CHECK_PIE_LANGUAGES)
if(_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER) if(_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER)
cmake_try_compiler_or_linker_flag(${lang} if(NOT DEFINED CMAKE_${lang}_LINK_PIE_SUPPORTED)
cmake_check_linker_flag(${lang}
"${CMAKE_${lang}_LINK_OPTIONS_PIE}" "${CMAKE_${lang}_LINK_OPTIONS_PIE}"
CMAKE_${lang}_LINK_PIE_SUPPORTED CMAKE_${lang}_LINK_PIE_SUPPORTED
OUTPUT_VARIABLE output) OUTPUT_VARIABLE output)
if (NOT CMAKE_${lang}_LINK_PIE_SUPPORTED) if (NOT CMAKE_${lang}_LINK_PIE_SUPPORTED)
string (APPEND outputs "PIE (${lang}): ${output}\n") string (APPEND outputs "PIE (${lang}): ${output}\n")
endif()
endif() endif()
cmake_try_compiler_or_linker_flag(${lang} if(NOT DEFINED CMAKE_${lang}_LINK_NO_PIE_SUPPORTED)
cmake_check_linker_flag(${lang}
"${CMAKE_${lang}_LINK_OPTIONS_NO_PIE}" "${CMAKE_${lang}_LINK_OPTIONS_NO_PIE}"
CMAKE_${lang}_LINK_NO_PIE_SUPPORTED CMAKE_${lang}_LINK_NO_PIE_SUPPORTED
OUTPUT_VARIABLE output) OUTPUT_VARIABLE output)
if (NOT CMAKE_${lang}_LINK_NO_PIE_SUPPORTED) if (NOT CMAKE_${lang}_LINK_NO_PIE_SUPPORTED)
string (APPEND outputs "NO_PIE (${lang}): ${output}\n") string (APPEND outputs "NO_PIE (${lang}): ${output}\n")
endif()
endif() endif()
else() else()
# no support at link time. Set cache variables to NO # no support at link time. Set cache variables to NO