summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorPeter Kuemmel <syntheticpp@gmx.net>2012-06-19 19:19:29 (GMT)
committerPeter Kuemmel <syntheticpp@gmx.net>2012-06-19 19:27:52 (GMT)
commit801f23fe517d305f5f38a38d534d2caec09d7ab8 (patch)
treeab18530164339ee8da09baba6d7e307399d444fb /Tests
parent54431e3395eb16033eb145edf12335852156ebe4 (diff)
downloadCMake-801f23fe517d305f5f38a38d534d2caec09d7ab8.zip
CMake-801f23fe517d305f5f38a38d534d2caec09d7ab8.tar.gz
CMake-801f23fe517d305f5f38a38d534d2caec09d7ab8.tar.bz2
Ninja: dep files and multiple -arch flags not possible on mac
Diffstat (limited to 'Tests')
-rw-r--r--Tests/BuildDepends/Project/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
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