summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeDetermineASMCompiler.cmake
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-04-21 22:51:55 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2008-04-21 22:51:55 (GMT)
commit21578050a7d99f6c9a0b1cdbaf0b933e1dfde6e4 (patch)
tree74958fcd4163d94099cef8a524b55aa803a83f13 /Modules/CMakeDetermineASMCompiler.cmake
parent20e9be907ff8dc238c91f87b23323ffdf3c072e1 (diff)
downloadCMake-21578050a7d99f6c9a0b1cdbaf0b933e1dfde6e4.zip
CMake-21578050a7d99f6c9a0b1cdbaf0b933e1dfde6e4.tar.gz
CMake-21578050a7d99f6c9a0b1cdbaf0b933e1dfde6e4.tar.bz2
BUG: fix handling of assembler executable (with path) #6858
Alex
Diffstat (limited to 'Modules/CMakeDetermineASMCompiler.cmake')
-rw-r--r--Modules/CMakeDetermineASMCompiler.cmake5
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index cf6099d..44bd234 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/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)