[arrow] branch master updated: ARROW-3147: [C++] Improve MSVC version detection

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 5829f10  ARROW-3147: [C++] Improve MSVC version detection
5829f10 is described below

commit 5829f10806e932db5e83211da994761be49c0026
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Thu Aug 30 14:32:47 2018 -0400

    ARROW-3147: [C++] Improve MSVC version detection
    
    There is no space between "Microsoft" and "(R)" in cl.exe output on
    code page 932.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #2499 from kou/cpp-windows-improve-msvc-version-detection and squashes the following commits:
    
    f00ef330 <Kouhei Sutou>  Improve MSVC version detection
---
 cpp/cmake_modules/CompilerInfo.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake
index e5a9550..76f692b 100644
--- a/cpp/cmake_modules/CompilerInfo.cmake
+++ b/cpp/cmake_modules/CompilerInfo.cmake
@@ -33,7 +33,7 @@ string(TOLOWER "${COMPILER_VERSION_FULL}" COMPILER_VERSION_FULL_LOWER)
 
 if(MSVC)
   set(COMPILER_FAMILY "msvc")
-  if ("${COMPILER_VERSION_FULL}" MATCHES ".*Microsoft \\(R\\) C/C\\+\\+ Optimizing Compiler Version 19.*x64")
+  if ("${COMPILER_VERSION_FULL}" MATCHES ".*Microsoft ?\\(R\\) C/C\\+\\+ Optimizing Compiler Version 19.*x64")
     string(REGEX REPLACE ".*Optimizing Compiler Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
       COMPILER_VERSION "${COMPILER_VERSION_FULL}")
   elseif(NOT "${COMPILER_VERSION_FULL}" STREQUAL "")