projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11eed99
)
[CMake] Minor fix to regex in r279152
author
Chris Bieneman
<beanz@apple.com>
Thu, 18 Aug 2016 21:36:36 +0000
(21:36 +0000)
committer
Chris Bieneman
<beanz@apple.com>
Thu, 18 Aug 2016 21:36:36 +0000
(21:36 +0000)
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
patch
|
blob
|
history
diff --git
a/llvm/tools/xcode-toolchain/CMakeLists.txt
b/llvm/tools/xcode-toolchain/CMakeLists.txt
index
d59f7e3
..
978c4bc
100644
(file)
--- 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})