From a7c87a9430f0d3c6cbc0eb362ff906112fae83b7 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Thu, 18 Aug 2016 21:36:36 +0000 Subject: [PATCH] [CMake] Minor fix to regex in r279152 The third version component is optional in Xcode's version spew, so we need to make it optional in the regex. llvm-svn: 279153 --- llvm/tools/xcode-toolchain/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/xcode-toolchain/CMakeLists.txt b/llvm/tools/xcode-toolchain/CMakeLists.txt index d59f7e3..978c4bc 100644 --- a/llvm/tools/xcode-toolchain/CMakeLists.txt +++ b/llvm/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][.][0-9])" version_match ${xcodebuild_version}) + string(REGEX MATCH "Xcode ([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}) -- 2.7.4