Repository: arrow Updated Branches: refs/heads/master ab15e01c7 -> ef6b46557
ARROW-563: Support non-standard gcc version strings Author: Uwe L. Korn <uw...@xhochy.com> Closes #343 from xhochy/ARROW-563 and squashes the following commits: 64d1c93 [Uwe L. Korn] ARROW-563: Support non-standard gcc version strings Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/ef6b4655 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/ef6b4655 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/ef6b4655 Branch: refs/heads/master Commit: ef6b4655798e9c31631377bd6412c36405001f7f Parents: ab15e01 Author: Uwe L. Korn <uw...@xhochy.com> Authored: Mon Feb 20 17:23:40 2017 -0500 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Mon Feb 20 17:23:40 2017 -0500 ---------------------------------------------------------------------- cpp/cmake_modules/CompilerInfo.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/ef6b4655/cpp/cmake_modules/CompilerInfo.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake index fe200be..079d9d1 100644 --- a/cpp/cmake_modules/CompilerInfo.cmake +++ b/cpp/cmake_modules/CompilerInfo.cmake @@ -21,6 +21,7 @@ execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -v ERROR_VARIABLE COMPILER_VERSION_FULL) message(INFO " ${COMPILER_VERSION_FULL}") message(INFO " ${CMAKE_CXX_COMPILER_ID}") +string(TOLOWER "${COMPILER_VERSION_FULL}" COMPILER_VERSION_FULL_LOWER) if(MSVC) set(COMPILER_FAMILY "msvc") @@ -53,10 +54,10 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-8") set(COMPILER_VERSION "3.8.0svn") # gcc -elseif("${COMPILER_VERSION_FULL}" MATCHES ".*gcc version.*") +elseif("${COMPILER_VERSION_FULL_LOWER}" MATCHES ".*gcc[ -]version.*") set(COMPILER_FAMILY "gcc") - string(REGEX REPLACE ".*gcc version ([0-9\\.]+).*" "\\1" - COMPILER_VERSION "${COMPILER_VERSION_FULL}") + string(REGEX REPLACE ".*gcc[ -]version ([0-9\\.]+).*" "\\1" + COMPILER_VERSION "${COMPILER_VERSION_FULL_LOWER}") else() message(FATAL_ERROR "Unknown compiler. Version info:\n${COMPILER_VERSION_FULL}") endif()
