[Cmake-commits] CMake branch, next, updated. v2.8.8-3263-gebb3c95

[Peter Kuemmel]

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  ebb3c952db187bfcc061abb7efe5d55fb0fe14ec (commit)
       via  801f23fe517d305f5f38a38d534d2caec09d7ab8 (commit)
      from  8eec424f2608e97cf1f88f67da5b3c63fa7cc45c (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=ebb3c952db187bfcc061abb7efe5d55fb0fe14ec
commit ebb3c952db187bfcc061abb7efe5d55fb0fe14ec
Merge: 8eec424 801f23f
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 19 15:29:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 19 15:29:11 2012 -0400

    Merge topic 'ninja-mac' into next
    
    801f23f Ninja: dep files and multiple -arch flags not possible on mac


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=801f23fe517d305f5f38a38d534d2caec09d7ab8
commit 801f23fe517d305f5f38a38d534d2caec09d7ab8
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 19 21:19:29 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 19 21:27:52 2012 +0200

    Ninja: dep files and multiple -arch flags not possible on mac

diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index a977884..4a17c43 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -18,7 +18,14 @@ endfunction()
 if(APPLE)
   # only use multi-arch if the sysroot exists on this machine
   if(EXISTS "${CMAKE_OSX_SYSROOT}")
-    set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
+    if("${CMAKE_GENERATOR}" MATCHES "Ninja")
+      # c++-4.2: -E, -S, -save-temps and -M options are not
+      #          allowed with multiple -arch flags
+      # but in a ninja build -MMD and -MT is set
+      set(CMAKE_OSX_ARCHITECTURES "i386")
+    else()
+      set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
+    endif()
     test_for_xcode4(is_xcode4)
     if(is_xcode4)
       # Xcode 4, use modern architectures as defaults

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

Summary of changes:
 Tests/BuildDepends/Project/CMakeLists.txt |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake