diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-10 11:43:01 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-10 11:43:01 (GMT) |
| commit | 392a6541b51dac5080a32fde67bc8aefd92a7226 (patch) | |
| tree | dabbdab83da2daec596640989fc3815986cd85b0 | |
| parent | 801f23fe517d305f5f38a38d534d2caec09d7ab8 (diff) | |
| download | CMake-392a6541b51dac5080a32fde67bc8aefd92a7226.zip CMake-392a6541b51dac5080a32fde67bc8aefd92a7226.tar.gz CMake-392a6541b51dac5080a32fde67bc8aefd92a7226.tar.bz2 | |
Ninja: on Mac no multiple -arch because of -M
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
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 |