parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-883: Support non-standard gcc version strings
Date Thu, 16 Feb 2017 14:35:46 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master c66db9590 -> bdd1fa53d


PARQUET-883: Support non-standard gcc version strings

Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #249 from xhochy/PARQUET-883 and squashes the following commits:

0fdeeda [Korn, Uwe] PARQUET-883: Support non-standard gcc version strings


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/bdd1fa53
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/bdd1fa53
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/bdd1fa53

Branch: refs/heads/master
Commit: bdd1fa53d6c8a76777d3fade3f7f80c3cbbd2d89
Parents: c66db95
Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>
Authored: Thu Feb 16 09:35:40 2017 -0500
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Thu Feb 16 09:35:40 2017 -0500

----------------------------------------------------------------------
 cmake_modules/CompilerInfo.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/bdd1fa53/cmake_modules/CompilerInfo.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/CompilerInfo.cmake b/cmake_modules/CompilerInfo.cmake
index 37615f6..ecc7e38 100644
--- a/cmake_modules/CompilerInfo.cmake
+++ b/cmake_modules/CompilerInfo.cmake
@@ -20,6 +20,7 @@
 execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -v
                 ERROR_VARIABLE COMPILER_VERSION_FULL)
 message(INFO " ${COMPILER_VERSION_FULL}")
+string(TOLOWER "${COMPILER_VERSION_FULL}" COMPILER_VERSION_FULL_LOWER)
 
 # clang on Linux and Mac OS X before 10.9
 if("${COMPILER_VERSION_FULL}" MATCHES ".*clang version.*")
@@ -37,10 +38,10 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-.*")
   set(COMPILER_FAMILY "clang")
 
 # 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()


Mime
View raw message