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

[Alex Lorenz via llvm-commits]

Author: arphaman
Date: Wed Jun 27 17:39:09 2018
New Revision: 335801

URL: http://llvm.org/viewvc/llvm-project?rev=335801&view=rev
Log:
[cmake][xcode-toolchain] add support for major Xcode version >= 10

The regex that extracts the Xcode version should support major versions with two
digits.

rdar://41465184

Modified:
    llvm/trunk/tools/xcode-toolchain/CMakeLists.txt

Modified: llvm/trunk/tools/xcode-toolchain/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/xcode-toolchain/CMakeLists.txt?rev=335801&r1=335800&r2=335801&view=diff
==============================================================================
--- llvm/trunk/tools/xcode-toolchain/CMakeLists.txt (original)
+++ llvm/trunk/tools/xcode-toolchain/CMakeLists.txt Wed Jun 27 17:39:09 2018
@@ -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})