diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-24 17:03:00 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-24 17:03:00 -0400 |
| commit | a195ca98ba16c0b55ccb17639a7edfd15c8ddc2c (patch) | |
| tree | f24eb6b4359e8d7a5d3c083b1c7e97c382670201 /Tests | |
| parent | d44ff1bea94a60b4c7df6498da23c20833a2e3e7 (diff) | |
| parent | 207ec5c3b13726bbb61d29bb1191ddbe992f8c1c (diff) | |
| download | cmake-a195ca98ba16c0b55ccb17639a7edfd15c8ddc2c.tar.gz | |
Merge topic 'ninja-mac-BuildDepends'
207ec5c Ninja: fix mis-matching endif() argument
392a654 Ninja: on Mac no multiple -arch because of -M
801f23f Ninja: dep files and multiple -arch flags not possible on mac
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index a977884c9f..ed8b8bf5d7 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -17,7 +17,8 @@ endfunction() if(APPLE) # only use multi-arch if the sysroot exists on this machine - if(EXISTS "${CMAKE_OSX_SYSROOT}") + # 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) @@ -25,7 +26,7 @@ if(APPLE) # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4 set(CMAKE_OSX_ARCHITECTURES i386 x86_64) endif() - endif(EXISTS "${CMAKE_OSX_SYSROOT}") + endif() endif(APPLE) add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx) |