[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2594-ge35667f

[Alexander Neundorf]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e35667fb1d2207777baf8d6027281ab8749ac800 (commit)
       via  e7722fdd15becd5ba311c6153442ca9592c50da9 (commit)
      from  bb2996e47a04abb7bdb434cd499f4a1232b79481 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e35667fb1d2207777baf8d6027281ab8749ac800
commit e35667fb1d2207777baf8d6027281ab8749ac800
Merge: bb2996e e7722fd
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Jun 11 16:00:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 11 16:00:18 2013 -0400

    Merge topic 'FixAsmSupport' into next
    
    e7722fd asm support: adapt to changes in CMakeDetectCompiler in 2.8.10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7722fdd15becd5ba311c6153442ca9592c50da9
commit e7722fdd15becd5ba311c6153442ca9592c50da9
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Jun 11 21:06:35 2013 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Jun 11 21:06:35 2013 +0200

    asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
    
    This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was
    modified (or added), and now the _INIT variable must not
    be set to a list anymore, before it worked.
    
    Alex

diff --git a/Modules/CMakeDetermineASM-ATTCompiler.cmake b/Modules/CMakeDetermineASM-ATTCompiler.cmake
index cec09e9..03c5668 100644
--- a/Modules/CMakeDetermineASM-ATTCompiler.cmake
+++ b/Modules/CMakeDetermineASM-ATTCompiler.cmake
@@ -15,6 +15,6 @@
 # determine the compiler to use for ASM using AT&T syntax, e.g. GNU as
 
 set(ASM_DIALECT "-ATT")
-set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}gas ${_CMAKE_TOOLCHAIN_PREFIX}as)
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gas ${_CMAKE_TOOLCHAIN_PREFIX}as)
 include(CMakeDetermineASMCompiler)
 set(ASM_DIALECT)
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index 3643b17..0fecb5d 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -39,8 +39,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
       endif()
     endif()
   else() # some specific assembler "dialect"
-    if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT)
-      message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be preset !")
+    if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT  AND NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST)
+      message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT or CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST must be preset !")
     endif()
   endif()
 
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake b/Modules/CMakeDetermineASM_NASMCompiler.cmake
index 50f71dd..5d783b1 100644
--- a/Modules/CMakeDetermineASM_NASMCompiler.cmake
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -14,7 +14,7 @@
 
 # Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is nasm compatible
 
-set(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm)
+set(CMAKE_ASM_NASM_COMPILER_LIST nasm yasm)
 
 if(NOT CMAKE_ASM_NASM_COMPILER)
   find_program(CMAKE_ASM_NASM_COMPILER nasm

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineASM-ATTCompiler.cmake  |    2 +-
 Modules/CMakeDetermineASMCompiler.cmake      |    4 ++--
 Modules/CMakeDetermineASM_NASMCompiler.cmake |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake