[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2623-g03e39be

[Brad King]

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  03e39be5319c5104c839e13389341315210f31f1 (commit)
       via  bc460ea2fc9223092da2fd65daefaf8eecc16cfb (commit)
      from  902208172455e347099199f0382fb230bbdb593a (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=03e39be5319c5104c839e13389341315210f31f1
commit 03e39be5319c5104c839e13389341315210f31f1
Merge: 9022081 bc460ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 14 08:57:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 14 08:57:08 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc460ea2fc9223092da2fd65daefaf8eecc16cfb
commit bc460ea2fc9223092da2fd65daefaf8eecc16cfb
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Jun 11 21:06:35 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 14 08:54:34 2013 -0400

    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 9999f62..99b04e3 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:


hooks/post-receive
-- 
CMake