[arrow] branch master updated: ARROW-14301: [C++] use consistent CMAKE_CXX_STANDARD definition

[kou]

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

kou 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 7bc63c0  ARROW-14301: [C++] use consistent CMAKE_CXX_STANDARD 
definition
7bc63c0 is described below

commit 7bc63c0d0d406b62541a050f98167996105c3a69
Author: Carlos O'Ryan <cor...@google.com>
AuthorDate: Wed Oct 13 05:18:52 2021 +0900

    ARROW-14301: [C++] use consistent CMAKE_CXX_STANDARD definition
    
    Tested locally with
    
    ```
    archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION="6.0.0.dev444" -e 
CMAKE_ARGS=-DCMAKE_CXX_STANDARD=17 ubuntu-cpp
    ```
    
    and
    
    ```
    archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION="6.0.0.dev444" -e 
CMAKE_ARGS=-DCMAKE_CXX_STANDARD=11 ubuntu-cpp
    ```
    
    and
    
    ```
    archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION="6.0.0.dev444"  
ubuntu-cpp
    ```
    
    Closes #11393 from 
coryan/ARROW-14301-use-consistent-cmake-cxx-standard-version
    
    Authored-by: Carlos O'Ryan <cor...@google.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 0fcbcc7..c13ff1e 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -684,6 +684,7 @@ set(EP_COMMON_CMAKE_ARGS
     -DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}
     -DCMAKE_CXX_FLAGS=${EP_CXX_FLAGS}
     -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}
+    -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
     -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}
     
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY})
 
@@ -2419,10 +2420,7 @@ macro(build_absl_once)
     message(STATUS "Building Abseil-cpp from source")
     set(ABSL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/absl_ep-install")
     set(ABSL_CMAKE_ARGS
-        "${EP_COMMON_CMAKE_ARGS}"
-        -DABSL_RUN_TESTS=OFF
-        -DCMAKE_CXX_STANDARD=11
-        -DCMAKE_INSTALL_LIBDIR=lib
+        "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF 
-DCMAKE_INSTALL_LIBDIR=lib
         "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}")
     set(ABSL_BUILD_BYPRODUCTS)
     set(ABSL_LIBRARIES)