diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-25 18:08:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-25 18:08:19 (GMT) |
| commit | 7a0125058101569c578a47d5f0091ad20ec55830 (patch) | |
| tree | 23872c9ddf14d5163906486f4daf32827c3b24bd | |
| parent | 3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db (diff) | |
| download | CMake-7a0125058101569c578a47d5f0091ad20ec55830.zip CMake-7a0125058101569c578a47d5f0091ad20ec55830.tar.gz CMake-7a0125058101569c578a47d5f0091ad20ec55830.tar.bz2 | |
CMakeDetermineCompilerABI: Fold copy error into CMAKE_<LANG>_ABI_COMPILED
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index e1b3c52..50d5cd1 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -65,10 +65,13 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) # Move result from cache to normal variable. set(CMAKE_${lang}_ABI_COMPILED ${CMAKE_${lang}_ABI_COMPILED}) unset(CMAKE_${lang}_ABI_COMPILED CACHE) + if(CMAKE_${lang}_ABI_COMPILED AND _copy_error) + set(CMAKE_${lang}_ABI_COMPILED 0) + endif() set(CMAKE_${lang}_ABI_COMPILED ${CMAKE_${lang}_ABI_COMPILED} PARENT_SCOPE) # Load the resulting information strings. - if(CMAKE_${lang}_ABI_COMPILED AND NOT _copy_error) + if(CMAKE_${lang}_ABI_COMPILED) message(CHECK_PASS "done") file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log "Detecting ${lang} compiler ABI info compiled with the following output:\n${OUTPUT}\n\n") |