diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-27 18:51:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-27 18:51:13 (GMT) |
| commit | 3f7312a97800801735a63dd65b17e06a0fc61348 (patch) | |
| tree | 6931315eca9d3238139ff086c6f13e2b6488900d | |
| parent | abe25dd79f53f70ef99ac0c75f5366d5d7302efa (diff) | |
| parent | 7ab5843c2672c3b6125cbda6c64d5071ac2031bb (diff) | |
| download | CMake-3f7312a97800801735a63dd65b17e06a0fc61348.zip CMake-3f7312a97800801735a63dd65b17e06a0fc61348.tar.gz CMake-3f7312a97800801735a63dd65b17e06a0fc61348.tar.bz2 | |
Merge topic 'asm-path-from-c'
7ab5843c26 ASM: Search for full path even when using C or C++ compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2418
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index 24048ed..45dea8f 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -22,11 +22,9 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) if("ASM${ASM_DIALECT}" STREQUAL "ASM") # the generic assembler support if(NOT CMAKE_ASM_COMPILER_INIT) if(CMAKE_C_COMPILER) - set(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "The ASM compiler") - set(CMAKE_ASM_COMPILER_ID "${CMAKE_C_COMPILER_ID}") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${CMAKE_C_COMPILER}) elseif(CMAKE_CXX_COMPILER) - set(CMAKE_ASM_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "The ASM compiler") - set(CMAKE_ASM_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${CMAKE_CXX_COMPILER}) else() # List all default C and CXX compilers set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST |