Repository: arrow Updated Branches: refs/heads/master c7e6a0716 -> c3cfa3d3b
ARROW-313: Build on any version of XCode Author: Christopher C. Aycock <[email protected]> Closes #155 from chrisaycock/ARROW-313 and squashes the following commits: e47cc01 [Christopher C. Aycock] ARROW-313: Build on any version of XCode Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/c3cfa3d3 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/c3cfa3d3 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/c3cfa3d3 Branch: refs/heads/master Commit: c3cfa3d3b3ce017776508f42fe9410bfb99cd94f Parents: c7e6a07 Author: Christopher C. Aycock <[email protected]> Authored: Tue Oct 4 14:07:59 2016 -0700 Committer: Julien Le Dem <[email protected]> Committed: Tue Oct 4 14:07:59 2016 -0700 ---------------------------------------------------------------------- cpp/cmake_modules/CompilerInfo.cmake | 4 ++-- python/cmake_modules/CompilerInfo.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/c3cfa3d3/cpp/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake index e1c821c..02f6fd4 100644 --- a/cpp/cmake_modules/CompilerInfo.cmake +++ b/cpp/cmake_modules/CompilerInfo.cmake @@ -29,9 +29,9 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*") string(REGEX REPLACE ".*based on LLVM ([0-9]+\\.[0.9]+).*" "\\1" COMPILER_VERSION "${COMPILER_VERSION_FULL}") -# clang on Mac OS X, XCode 7. No version replacement is done +# clang on Mac OS X, XCode 7+. No version replacement is done # because Apple no longer advertises the upstream LLVM version. -elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*") +elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-.*") set(COMPILER_FAMILY "clang") # gcc http://git-wip-us.apache.org/repos/asf/arrow/blob/c3cfa3d3/python/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake index 55f989a..8e85bde 100644 --- a/python/cmake_modules/CompilerInfo.cmake +++ b/python/cmake_modules/CompilerInfo.cmake @@ -32,9 +32,9 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*") string(REGEX REPLACE ".*based on LLVM ([0-9]+\\.[0.9]+).*" "\\1" COMPILER_VERSION "${COMPILER_VERSION_FULL}") -# clang on Mac OS X, XCode 7. No version replacement is done +# clang on Mac OS X, XCode 7+. No version replacement is done # because Apple no longer advertises the upstream LLVM version. -elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*") +elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-.*") set(COMPILER_FAMILY "clang") # gcc
