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 7cf3c720d7336cb52d1bd8c61170c1915cfdcc6e (commit)
via 392a6541b51dac5080a32fde67bc8aefd92a7226 (commit)
from d67a635d5af74aaa1ea27d4d1ff924e569d4aa48 (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=7cf3c720d7336cb52d1bd8c61170c1915cfdcc6e
commit 7cf3c720d7336cb52d1bd8c61170c1915cfdcc6e
Merge: d67a635 392a654
Author: Peter Kuemmel <syntheti...@gmx.net>
AuthorDate: Tue Jul 10 07:46:29 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jul 10 07:46:29 2012 -0400
Merge topic 'ninja-mac-BuildDepends' into next
392a654 Ninja: on Mac no multiple -arch because of -M
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=392a6541b51dac5080a32fde67bc8aefd92a7226
commit 392a6541b51dac5080a32fde67bc8aefd92a7226
Author: Peter Kümmel <syntheti...@gmx.net>
AuthorDate: Tue Jul 10 13:43:01 2012 +0200
Commit: Peter Kümmel <syntheti...@gmx.net>
CommitDate: Tue Jul 10 13:43:01 2012 +0200
Ninja: on Mac no multiple -arch because of -M
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt
b/Tests/BuildDepends/Project/CMakeLists.txt
index 4a17c43..e97b661 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -17,15 +17,9 @@ endfunction()
if(APPLE)
# only use multi-arch if the sysroot exists on this machine
- if(EXISTS "${CMAKE_OSX_SYSROOT}")
- 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()
+ # Ninja needs -M which could not be used with multiple -arch flags
+ if(EXISTS "${CMAKE_OSX_SYSROOT}" AND NOT "${CMAKE_GENERATOR}" MATCHES
"Ninja")
+ set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
test_for_xcode4(is_xcode4)
if(is_xcode4)
# Xcode 4, use modern architectures as defaults
-----------------------------------------------------------------------
Summary of changes:
Tests/BuildDepends/Project/CMakeLists.txt | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
