diff options
| author | Fred Baksik <fdk17@ftml.net> | 2020-07-15 19:03:45 (GMT) |
|---|---|---|
| committer | Fred Baksik <fred.baksik@mrcy.com> | 2020-07-29 15:51:27 (GMT) |
| commit | deec2f587cd0bd08ee6866d06b9600dee98af910 (patch) | |
| tree | 2fb0a4ecea672c6d6718798957acf66a711f8c39 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | ca899af3e2d5af3d79d345322b300c348065f560 (diff) | |
| download | CMake-deec2f587cd0bd08ee6866d06b9600dee98af910.zip CMake-deec2f587cd0bd08ee6866d06b9600dee98af910.tar.gz CMake-deec2f587cd0bd08ee6866d06b9600dee98af910.tar.bz2 | |
Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detection
Fixes: #20040
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 832b18d..d7a35e1 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -14,8 +14,10 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) # Make sure user-specified compiler flags are used. if(CMAKE_${lang}_FLAGS) set(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS}) - else() + elseif(DEFINED ENV{${flagvar}}) set(CMAKE_${lang}_COMPILER_ID_FLAGS $ENV{${flagvar}}) + else(CMAKE_${lang}_FLAGS_INIT) + set(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS_INIT}) endif() string(REPLACE " " ";" CMAKE_${lang}_COMPILER_ID_FLAGS_LIST "${CMAKE_${lang}_COMPILER_ID_FLAGS}") |