[Cmake-commits] CMake branch, next, updated. v2.8.8-3234-g49a7356

[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  49a7356c15072b46f64f16c9a4c092f88f175514 (commit)
       via  d6865175a73f657336e48557bd670b08743df5a7 (commit)
      from  638d97765f5ff7f8d0ad91c796d110927e61fad6 (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=49a7356c15072b46f64f16c9a4c092f88f175514
commit 49a7356c15072b46f64f16c9a4c092f88f175514
Merge: 638d977 d686517
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 19 08:10:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 08:10:23 2012 -0400

    Merge topic 'test-Assembler-C-flags' into next
    
    d686517 Tests/Assembler: Assemble and link with same flags (#13314)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6865175a73f657336e48557bd670b08743df5a7
commit d6865175a73f657336e48557bd670b08743df5a7
Author:     Daniel R. Gomez <gomez at teragram.com>
AuthorDate: Mon Jun 18 16:19:38 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 18 16:21:54 2012 -0400

    Tests/Assembler: Assemble and link with same flags (#13314)
    
    The test uses the C compiler as the assembler so use the C flags for ASM
    too.  This is important when the flags specify the target ABI.

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index ad27e57..456e496 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -23,6 +23,7 @@ endif("${CMAKE_GENERATOR}" MATCHES "Makefile")
 
 
 if(SRCS)
+  set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS}")
   enable_language(ASM OPTIONAL)
 else(SRCS)
   message(STATUS "No assembler enabled, using C")

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

Summary of changes:
 Tests/Assembler/CMakeLists.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake