Repository: parquet-cpp Updated Branches: refs/heads/master 176b08c30 -> bec8fd4f3
PARQUET-736: Support newer XCode versions Author: Korn, Uwe <[email protected]> Closes #170 from xhochy/PARQUET-736 and squashes the following commits: 32cb2e9 [Korn, Uwe] PARQUET-736: Support newer XCode versions Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/bec8fd4f Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/bec8fd4f Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/bec8fd4f Branch: refs/heads/master Commit: bec8fd4f3d59eb492aee501fe9c7e359396970ab Parents: 176b08c Author: Korn, Uwe <[email protected]> Authored: Thu Oct 6 07:02:15 2016 +0200 Committer: Uwe L. Korn <[email protected]> Committed: Thu Oct 6 07:02:15 2016 +0200 ---------------------------------------------------------------------- cmake_modules/CompilerInfo.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/bec8fd4f/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/CompilerInfo.cmake b/cmake_modules/CompilerInfo.cmake index efb7305..37615f6 100644 --- a/cmake_modules/CompilerInfo.cmake +++ b/cmake_modules/CompilerInfo.cmake @@ -32,10 +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. -elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-7") +# clang on Mac OS X, XCode 7+. +elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-.*") set(COMPILER_FAMILY "clang") - set(COMPILER_VERSION "3.7.0svn") # gcc elseif("${COMPILER_VERSION_FULL}" MATCHES ".*gcc version.*")
