406bf0b602
This is already merged upstream and slated for 3.20, but is convenient to have in ports now (with CMake 3.19.4). It allows propagating CMAKE_EXE_LINKER_FLAGS into fortran-compatibility-tests in the face of post-CMake-3.10 policy settings. Patch from yuri@, only massaged to avoid having an octothorpe in a filename. PR: 253381 Submitted by: yuri@ Obtained from: upstream
60 lines
2.8 KiB
Plaintext
60 lines
2.8 KiB
Plaintext
- Backport https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5483/diffs?commit_id=15e77fbd40e324fd0be394a73ed94800bb47ad2e that is schedueled for 3.20
|
|
|
|
diff --git Modules/FortranCInterface.cmake Modules/FortranCInterface.cmake
|
|
index 547346ba90782d765cac860f755641cfb55b6dcf..733c7232c737e1c9a721124fc8a5465eaf872d91 100644
|
|
--- Modules/FortranCInterface.cmake
|
|
+++ Modules/FortranCInterface.cmake
|
|
@@ -343,6 +343,13 @@ function(FortranCInterface_VERIFY)
|
|
set(_desc "Verifying Fortran/${lang} Compiler Compatibility")
|
|
message(CHECK_START "${_desc}")
|
|
|
|
+ cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
|
|
+ if(_FortranCInterface_CMP0056 STREQUAL "NEW")
|
|
+ set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
|
|
+ else()
|
|
+ set(_FortranCInterface_EXE_LINKER_FLAGS "")
|
|
+ endif()
|
|
+
|
|
# Build a sample project which reports symbols.
|
|
set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
|
|
try_compile(FortranCInterface_VERIFY_${lang}_COMPILED
|
|
@@ -358,6 +365,7 @@ function(FortranCInterface_VERIFY)
|
|
"-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
|
|
"-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}"
|
|
"-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
|
|
+ ${_FortranCInterface_EXE_LINKER_FLAGS}
|
|
OUTPUT_VARIABLE _output)
|
|
file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}")
|
|
|
|
diff --git Modules/FortranCInterface/Detect.cmake Modules/FortranCInterface/Detect.cmake
|
|
index c75067b32e4b7eeba1edf7d6bc6acc3798032dd7..998faf1eccf92f654f78ea66f2a34a8b05b5f991 100644
|
|
--- Modules/FortranCInterface/Detect.cmake
|
|
+++ Modules/FortranCInterface/Detect.cmake
|
|
@@ -26,6 +26,14 @@ unset(FortranCInterface_VERIFIED_CXX CACHE)
|
|
|
|
set(_result)
|
|
|
|
+cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
|
|
+if(_FortranCInterface_CMP0056 STREQUAL "NEW")
|
|
+ set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
|
|
+else()
|
|
+ set(_FortranCInterface_EXE_LINKER_FLAGS "")
|
|
+endif()
|
|
+unset(_FortranCInterface_CMP0056)
|
|
+
|
|
# Build a sample project which reports symbols.
|
|
set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
|
|
try_compile(FortranCInterface_COMPILED
|
|
@@ -38,9 +46,11 @@ try_compile(FortranCInterface_COMPILED
|
|
"-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
|
|
"-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
|
|
"-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
|
|
+ ${_FortranCInterface_EXE_LINKER_FLAGS}
|
|
OUTPUT_VARIABLE FortranCInterface_OUTPUT)
|
|
set(FortranCInterface_COMPILED ${FortranCInterface_COMPILED})
|
|
unset(FortranCInterface_COMPILED CACHE)
|
|
+unset(_FortranCInterface_EXE_LINKER_FLAGS)
|
|
|
|
# Locate the sample project executable.
|
|
set(FortranCInterface_EXE)
|