[Cmake-commits] [cmake-commits] alex committed CMakeDetermineASM-ATTCompiler.cmake 1.1 1.2 CMakeDetermineASMCompiler.cmake 1.3 1.4 CMakeTestASM-ATTCompiler.cmake 1.1 1.2 CMakeASM_MASMInformation.cmake NONE 1.1 CMakeDetermineASM_MASMCompiler.cmake NONE 1.1 CMakeTestASM_MASMCompiler.cmake NONE 1.1

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeDetermineASM-ATTCompiler.cmake 
	CMakeDetermineASMCompiler.cmake CMakeTestASM-ATTCompiler.cmake 
Added Files:
	CMakeASM_MASMInformation.cmake 
	CMakeDetermineASM_MASMCompiler.cmake 
	CMakeTestASM_MASMCompiler.cmake 
Log Message:
ENH: add support for the MS masm and masm64 assemblers, works with nmake,
not (yet) with the Visual Studio generators

Alex


Index: CMakeDetermineASM-ATTCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineASM-ATTCompiler.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeDetermineASM-ATTCompiler.cmake	28 Jun 2007 13:14:27 -0000	1.1
--- CMakeDetermineASM-ATTCompiler.cmake	5 Nov 2008 22:27:41 -0000	1.2
***************
*** 1,3 ****
! # determine the compiler to use for ASM using AT&T syntax
  
  SET(ASM_DIALECT "-ATT")
--- 1,3 ----
! # determine the compiler to use for ASM using AT&T syntax, e.g. GNU as
  
  SET(ASM_DIALECT "-ATT")

Index: CMakeTestASM-ATTCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestASM-ATTCompiler.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeTestASM-ATTCompiler.cmake	28 Jun 2007 13:14:27 -0000	1.1
--- CMakeTestASM-ATTCompiler.cmake	5 Nov 2008 22:27:41 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  # is set and cmake stops processing commands and will not generate
  # any makefiles or projects.
+ 
  SET(ASM_DIALECT "-ATT")
  INCLUDE(CMakeTestASMCompiler)

--- NEW FILE: CMakeDetermineASM_MASMCompiler.cmake ---
# Find the MS assembler (masm or masm64)

SET(ASM_DIALECT "_MASM")

# if we are using the 64bit cl compiler, assume we also want the 64bit assembler
IF(CMAKE_CL_64)
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml64)
ELSE(CMAKE_CL_64)
   SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml)
ENDIF(CMAKE_CL_64)

INCLUDE(CMakeDetermineASMCompiler)
SET(ASM_DIALECT)

--- NEW FILE: CMakeTestASM_MASMCompiler.cmake ---

# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that the selected ASM_MASM "compiler" (should be masm or masm64) 
# can actually "compile" and link the most basic of programs.   If not, a 
# fatal error is set and cmake stops processing commands and will not generate
# any makefiles or projects.

SET(ASM_DIALECT "_MASM")
INCLUDE(CMakeTestASMCompiler)
SET(ASM_DIALECT)

--- NEW FILE: CMakeASM_MASMInformation.cmake ---
# support for the MS assembler, masm and masm64

SET(ASM_DIALECT "_MASM")

SET(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)

SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> /c  /Fo <OBJECT> <SOURCE>")

INCLUDE(CMakeASMInformation)
SET(ASM_DIALECT)

Index: CMakeDetermineASMCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineASMCompiler.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeDetermineASMCompiler.cmake	15 May 2008 16:07:43 -0000	1.3
--- CMakeDetermineASMCompiler.cmake	5 Nov 2008 22:27:41 -0000	1.4
***************
*** 18,22 ****
      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")
  
  ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
--- 18,22 ----
      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} PATHS ${_CMAKE_TOOLCHAIN_LOCATION} DOC "Assembler")
  
  ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)