diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-11-05 22:27:41 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-11-05 22:27:41 (GMT) |
| commit | 19046aa98c863c8ed2e957f0ddd404b60577be85 (patch) | |
| tree | 9a5c5b48a25a261fcfff24ef396e3046c445a531 /Modules/CMakeDetermineASMCompiler.cmake | |
| parent | 49db4e53a1e351278bc8e93bf004510e71804486 (diff) | |
| download | CMake-19046aa98c863c8ed2e957f0ddd404b60577be85.zip CMake-19046aa98c863c8ed2e957f0ddd404b60577be85.tar.gz CMake-19046aa98c863c8ed2e957f0ddd404b60577be85.tar.bz2 | |
ENH: add support for the MS masm and masm64 assemblers, works with nmake,
not (yet) with the Visual Studio generators
Alex
Diffstat (limited to 'Modules/CMakeDetermineASMCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index eac8c55..da7194a 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -17,7 +17,7 @@ IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) IF (_CMAKE_USER_CXX_COMPILER_PATH OR _CMAKE_USER_C_COMPILER_PATH) FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST} PATHS ${_CMAKE_USER_C_COMPILER_PATH} ${_CMAKE_USER_CXX_COMPILER_PATH} DOC "Assembler" NO_DEFAULT_PATH) ENDIF (_CMAKE_USER_CXX_COMPILER_PATH OR _CMAKE_USER_C_COMPILER_PATH) - FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST} DOC "Assembler") + FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST} PATHS ${_CMAKE_TOOLCHAIN_LOCATION} DOC "Assembler") ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) |