Return-Path: X-Original-To: apmail-arrow-commits-archive@minotaur.apache.org Delivered-To: apmail-arrow-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A4F8D194B7 for ; Thu, 31 Mar 2016 17:03:05 +0000 (UTC) Received: (qmail 27813 invoked by uid 500); 31 Mar 2016 17:03:05 -0000 Delivered-To: apmail-arrow-commits-archive@arrow.apache.org Received: (qmail 27797 invoked by uid 500); 31 Mar 2016 17:03:05 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 27788 invoked by uid 99); 31 Mar 2016 17:03:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Mar 2016 17:03:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60EA0DFE04; Thu, 31 Mar 2016 17:03:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: <149d6f1fe5334627a185f58948c47911@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-93: Fix builds when using XCode 7.3 Date: Thu, 31 Mar 2016 17:03:05 +0000 (UTC) Repository: arrow Updated Branches: refs/heads/master 2d8627cd8 -> 5a68f8d73 ARROW-93: Fix builds when using XCode 7.3 Author: Dan Robinson Closes #54 from danrobinson/ARROW-93 and squashes the following commits: ddff5b0 [Dan Robinson] ARROW-93: Fix builds when using XCode 7.3 Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/5a68f8d7 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/5a68f8d7 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/5a68f8d7 Branch: refs/heads/master Commit: 5a68f8d737aa94ff3d09dae4e5b29883e798e9c4 Parents: 2d8627c Author: Dan Robinson Authored: Thu Mar 31 10:02:54 2016 -0700 Committer: Wes McKinney Committed: Thu Mar 31 10:02:54 2016 -0700 ---------------------------------------------------------------------- cpp/cmake_modules/CompilerInfo.cmake | 2 +- python/cmake_modules/CompilerInfo.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/5a68f8d7/cpp/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake index 0786068..e1c821c 100644 --- a/cpp/cmake_modules/CompilerInfo.cmake +++ b/cpp/cmake_modules/CompilerInfo.cmake @@ -31,7 +31,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*") # 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-700\\..*") +elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*") set(COMPILER_FAMILY "clang") # gcc http://git-wip-us.apache.org/repos/asf/arrow/blob/5a68f8d7/python/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake index e66bc26..55f989a 100644 --- a/python/cmake_modules/CompilerInfo.cmake +++ b/python/cmake_modules/CompilerInfo.cmake @@ -34,7 +34,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*") # 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-700\\..*") +elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*") set(COMPILER_FAMILY "clang") # gcc