[Cmake-commits] [cmake-commits] alex committed CMakeDetermineASMCompiler.cmake 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14220

Modified Files:
	CMakeDetermineASMCompiler.cmake 
Log Message:
BUG: fix handling of assembler executable (with path) #6858

Alex


Index: CMakeDetermineASMCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineASMCompiler.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeDetermineASMCompiler.cmake	28 Jun 2007 13:14:27 -0000	1.1
--- CMakeDetermineASMCompiler.cmake	21 Apr 2008 22:51:55 -0000	1.2
***************
*** 29,35 ****
    # 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)
      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)
--- 29,34 ----
    # if it is found, force it into the cache, 
    # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND"
!   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)