Просмотр исходного кода

BUG: fix handling of assembler executable (with path) #6858

Alex
Alexander Neundorf 17 лет назад
Родитель
Сommit
21578050a7
1 измененных файлов с 2 добавлено и 3 удалено
  1. 2 3
      Modules/CMakeDetermineASMCompiler.cmake

+ 2 - 3
Modules/CMakeDetermineASMCompiler.cmake

@@ -28,9 +28,8 @@ ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
   # now try to find it with the full path
   # if it is found, force it into the cache, 
   # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
-  # if the C compiler already had a path, reuse it for searching the CXX compiler
-  GET_FILENAME_COMPONENT(_CMAKE_USER_ASM_COMPILER_PATH "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH)
-  IF(NOT _CMAKE_USER_ASM_COMPILER_PATH)
+  GET_FILENAME_COMPONENT(_CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH)
+  IF(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH)
     FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER})
     MARK_AS_ADVANCED(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH)
     IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH)