[Cmake-commits] CMake branch, next, updated. v2.8.9-86-gb35dcb3

[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  b35dcb3de73ff3696ac2e494521d8688f0aa73cb (commit)
       via  97140d398668c0ab708ac3e0ec72c57605d6f4a9 (commit)
      from  be5f6ece86bccc7d834ed2546aafb499e0f65c79 (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=b35dcb3de73ff3696ac2e494521d8688f0aa73cb
commit b35dcb3de73ff3696ac2e494521d8688f0aa73cb
Merge: be5f6ec 97140d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 15 13:00:25 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 13:00:25 2012 -0400

    Merge topic 'xcode-asm' into next
    
    97140d3 Tests/Assembler: Do not use assembler in universal binaries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97140d398668c0ab708ac3e0ec72c57605d6f4a9
commit 97140d398668c0ab708ac3e0ec72c57605d6f4a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 15 12:55:03 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 15 12:55:03 2012 -0400

    Tests/Assembler: Do not use assembler in universal binaries
    
    If CMAKE_OSX_ARCHITECTURES is set then the computed assembler .s source
    file may not work for all architectures.  Skip it in that case.

diff --git a/Tests/Assembler/CMakeLists.txt b/Tests/Assembler/CMakeLists.txt
index 3596d05..94a6325 100644
--- a/Tests/Assembler/CMakeLists.txt
+++ b/Tests/Assembler/CMakeLists.txt
@@ -7,7 +7,8 @@ set(SRCS)
 
 # (at least) the following toolchains can process assembler files directly
 # and also generate assembler files from C:
-if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode")
+if("${CMAKE_GENERATOR}" MATCHES "Makefile|Xcode" AND
+    NOT CMAKE_OSX_ARCHITECTURES)
   if(("${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|Clang|HP|SunPro|XL)$") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel"  AND  UNIX))
     set(C_FLAGS "${CMAKE_C_FLAGS}")
     separate_arguments(C_FLAGS)

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

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


hooks/post-receive
-- 
CMake