diff options
| author | David Cole <david.cole@kitware.com> | 2011-07-15 19:34:17 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-07-15 19:34:17 (GMT) |
| commit | c050c592eef00a13bfc1e9bf31e45b2005588ccf (patch) | |
| tree | 2c06aaabe99ed46a40df351ea186f12f88657bca /Tests/BuildDepends | |
| parent | 923b030ed989472bc421379eecc5f8c979dc6ccb (diff) | |
| download | CMake-c050c592eef00a13bfc1e9bf31e45b2005588ccf.zip CMake-c050c592eef00a13bfc1e9bf31e45b2005588ccf.tar.gz CMake-c050c592eef00a13bfc1e9bf31e45b2005588ccf.tar.bz2 | |
Fix BuildDepends test to work with Xcode 4
ppc tools are no longer available in the Xcode 4 installation.
Eliminate the use of the hard-coded 'ppc' in the test when
running on Snow Leopard or later.
Diffstat (limited to 'Tests/BuildDepends')
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index 70a2f37..f03c238 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -4,6 +4,11 @@ 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(NOT "${DARWIN_MAJOR_VERSION}.${DARWIN_MINOR_VERSION}" VERSION_LESS 10.0) + # Snow Leopard or later, use modern architectures as defaults + # 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(APPLE) |