diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-02 10:44:25 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-02 12:48:20 -0400 |
| commit | 765b46d1e1c6bc397942764fcbdd9fab9d29cb11 (patch) | |
| tree | 485c9757ce1a5362861892f8c66aab95ac202eaa /Tests/Architecture | |
| parent | c0133a58e85f763299e3f91702f988ab9c915b8a (diff) | |
| download | cmake-765b46d1e1c6bc397942764fcbdd9fab9d29cb11.tar.gz | |
Xcode: Fix test architecture selection for Xcode >= 5
In Tests/Architecture and Tests/BuildDepends/Project we select a set of
OS X cpu architectures to use for the test. Prior to Xcode 4 we always
used i386 and ppc. Starting with Xcode 4, the tools do not support ppc
but do support x86_64, so we switch to that. Fix the version check to
recognize Xcode >= 5 as at least Xcode 4 and use the new architectures.
Diffstat (limited to 'Tests/Architecture')
| -rw-r--r-- | Tests/Architecture/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/Architecture/CMakeLists.txt b/Tests/Architecture/CMakeLists.txt index 927ce3fed7..ea5fc0b506 100644 --- a/Tests/Architecture/CMakeLists.txt +++ b/Tests/Architecture/CMakeLists.txt @@ -7,8 +7,8 @@ function(test_for_xcode4 result_var) execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE ov RESULT_VARIABLE rv ) - if("${rv}" STREQUAL "0") - if(ov MATCHES "^Xcode 4.[0-9].*$") + if("${rv}" STREQUAL "0" AND ov MATCHES "^Xcode ([0-9]+)\\.") + if(NOT CMAKE_MATCH_1 VERSION_LESS 4) set(${result_var} 1 PARENT_SCOPE) endif() endif() |