diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-15 16:58:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-15 17:06:18 (GMT) |
| commit | 3ddd7f35760055fc501d454f9029f3987536957b (patch) | |
| tree | 37932a0f25ef5e617cb662391503e1c4adc045cd /Modules/CMakeTestSwiftCompiler.cmake | |
| parent | 7c6234dd21b7af95e7edea6b281d859dafb2ae81 (diff) | |
| download | CMake-3ddd7f35760055fc501d454f9029f3987536957b.zip CMake-3ddd7f35760055fc501d454f9029f3987536957b.tar.gz CMake-3ddd7f35760055fc501d454f9029f3987536957b.tar.bz2 | |
enable_language: Fix test for working compiler with CMP0126 NEW behavior
Update the logic that converts a `try_compile` result from a cache
entry to a normal variable to tolerate an existing normal variable
under CMP0126 NEW behavior. Otherwise the `try_compile` result
is ignored because CMake uses the false value of the normal variable,
and CMake incorrectly reports that the compiler does not work.
This went unnoticed for some languages (e.g. C and CXX) because the
check for a working compiler is skipped if ABI detection works.
It does affect other languages (e.g. CSharp).
Fixes: #22423
Diffstat (limited to 'Modules/CMakeTestSwiftCompiler.cmake')
| -rw-r--r-- | Modules/CMakeTestSwiftCompiler.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/CMakeTestSwiftCompiler.cmake b/Modules/CMakeTestSwiftCompiler.cmake index d98dc9d..2f2546f 100644 --- a/Modules/CMakeTestSwiftCompiler.cmake +++ b/Modules/CMakeTestSwiftCompiler.cmake @@ -23,6 +23,9 @@ if(NOT CMAKE_Swift_COMPILER_WORKS) PrintTestCompilerStatus("Swift") file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift "print(\"CMake\")\n") + # Clear result from normal variable. + unset(CMAKE_Swift_COMPILER_WORKS) + # Puts test result in cache variable. try_compile(CMAKE_Swift_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT) |