kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-mac-BuildDepends'

Browse Source 
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
This commit is contained in:
David Cole 2012-07-24 17:03:00 -04:00 committed by CMake Topic Stage
commit a195ca98ba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/BuildDepends/Project/CMakeLists.txt
View File

@ -17,7 +17,8 @@ endfunction()
if(APPLE) if(APPLE)
# only use multi-arch if the sysroot exists on this machine # 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") set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
test_for_xcode4(is_xcode4) test_for_xcode4(is_xcode4)
if(is_xcode4) if(is_xcode4)
@ -25,7 +26,7 @@ if(APPLE)
# Arch 'ppc' no longer works: tools no longer available starting with Xcode 4 # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4
set(CMAKE_OSX_ARCHITECTURES i386 x86_64) set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
endif() endif()
endif(EXISTS "${CMAKE_OSX_SYSROOT}") endif()
endif(APPLE) endif(APPLE)
add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx) add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx)