[Cmake-commits] [cmake-commits] alex committed CMakeDetermineASMCompiler.cmake 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeDetermineASMCompiler.cmake 
Log Message:
Correct comments and use ASM${ASM_DIALECT} env. var instead of ASM env. var to initialize the the assembler to use.

Alex


Index: CMakeDetermineASMCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineASMCompiler.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** CMakeDetermineASMCompiler.cmake	5 Nov 2008 22:27:41 -0000	1.4
--- CMakeDetermineASMCompiler.cmake	26 Sep 2009 09:20:03 -0000	1.5
***************
*** 22,26 ****
  ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
  
!   # we only get here if CMAKE_C_COMPILER was specified using -D or a pre-made CMakeCache.txt
    # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
    #
--- 22,26 ----
  ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
  
!   # we only get here if CMAKE_ASM${ASM_DIALECT}_COMPILER was specified using -D or a pre-made CMakeCache.txt
    # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
    #
***************
*** 44,52 ****
  ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
  
! # If we have a gcc cross compiler, they have usually some prefix, like 
! # e.g. powerpc-linux-gcc, arm-elf-gcc or i586-mingw32msvc-gcc .
  # The other tools of the toolchain usually have the same prefix
  # NAME_WE cannot be used since then this test will fail for names lile
! # "arm-unknown-nto-qnx6.3.0-gcc.exe", where BASENAME would be 
  # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
  IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
--- 44,52 ----
  ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION)
  
! # If we have a gas/as cross compiler, they have usually some prefix, like 
! # e.g. powerpc-linux-gas, arm-elf-gas or i586-mingw32msvc-gas .
  # The other tools of the toolchain usually have the same prefix
  # NAME_WE cannot be used since then this test will fail for names lile
! # "arm-unknown-nto-qnx6.3.0-gas.exe", where BASENAME would be 
  # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
  IF (NOT _CMAKE_TOOLCHAIN_PREFIX)
***************
*** 59,63 ****
  INCLUDE(CMakeFindBinUtils)
  
! SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR "ASM")
  
  IF(CMAKE_ASM${ASM_DIALECT}_COMPILER)
--- 59,63 ----
  INCLUDE(CMakeFindBinUtils)
  
! SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR "ASM${ASM_DIALECT}")
  
  IF(CMAKE_ASM${ASM_DIALECT}_COMPILER)