From 801f23fe517d305f5f38a38d534d2caec09d7ab8 Mon Sep 17 00:00:00 2001 From: Peter Kuemmel Date: Tue, 19 Jun 2012 21:19:29 +0200 Subject: Ninja: dep files and multiple -arch flags not possible on mac --- Tests/BuildDepends/Project/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 -- cgit v0.12