Browse Source

Merge topic 'asm-path-from-c'

7ab5843c26 ASM: Search for full path even when using C or C++ compiler

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2418
Brad King 7 years ago
parent
commit
3f7312a978
1 changed files with 2 additions and 4 deletions
  1. 2 4
      Modules/CMakeDetermineASMCompiler.cmake

+ 2 - 4
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