[cmake][xcode-toolchain] add support for major Xcode version >= 10

hyp · hyp · commit 647959670b93 · 2018-06-27T17:47:08.000-07:00
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)
diff --git a/tools/xcode-toolchain/CMakeLists.txt b/tools/xcode-toolchain/CMakeLists.txt
@@ -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})

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ if(NOT XCODE_VERSION)`
`49`	`49`	`OUTPUT_STRIP_TRAILING_WHITESPACE`
`50`	`50`	`ERROR_FILE /dev/null`
`51`	`51`	`)`
`52`		`- string(REGEX MATCH "Xcode ([0-9]([.][0-9])+)" version_match ${xcodebuild_version})`
	`52`	`+ string(REGEX MATCH "Xcode ([0-9][0-9]?([.][0-9])+)" version_match ${xcodebuild_version})`
`53`	`53`	`if(version_match)`
`54`	`54`	`message(STATUS "Identified Xcode Version: ${CMAKE_MATCH_1}")`
`55`	`55`	`set(XCODE_VERSION ${CMAKE_MATCH_1})`