Skip to content
This repository has been archived by the owner on Mar 28, 2020. It is now read-only.
/ swift-llvm Public archive

Commit

Permalink
[cmake][xcode-toolchain] add support for major Xcode version >= 10
Browse files Browse the repository at this point in the history
The regex that extracts the Xcode version should support major versions with two
digits.

rdar://41465184


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@335801 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 5dc174c)
  • Loading branch information
hyp committed Jun 28, 2018
1 parent 9283149 commit 6479596
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/xcode-toolchain/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if(NOT XCODE_VERSION)
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_FILE /dev/null
)
string(REGEX MATCH "Xcode ([0-9]([.][0-9])+)" version_match ${xcodebuild_version})
string(REGEX MATCH "Xcode ([0-9][0-9]?([.][0-9])+)" version_match ${xcodebuild_version})
if(version_match)
message(STATUS "Identified Xcode Version: ${CMAKE_MATCH_1}")
set(XCODE_VERSION ${CMAKE_MATCH_1})
Expand Down

0 comments on commit 6479596

Please sign in to comment.