You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2023/05/04 16:49:11 UTC
[arrow-adbc] branch main updated: build(c): only set CMAKE_CXX_STANDARD when building GoogleTest (#651)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 3a6f20b build(c): only set CMAKE_CXX_STANDARD when building GoogleTest (#651)
3a6f20b is described below
commit 3a6f20bcf78b26ef9195effb1c37dd4038c47dd4
Author: David Li <li...@gmail.com>
AuthorDate: Thu May 4 12:49:06 2023 -0400
build(c): only set CMAKE_CXX_STANDARD when building GoogleTest (#651)
GoogleTest needs C++17 now; we still support C++11.
Fixes #650.
---
c/cmake_modules/AdbcDefines.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/c/cmake_modules/AdbcDefines.cmake b/c/cmake_modules/AdbcDefines.cmake
index c82dd9e..25dfcba 100644
--- a/c/cmake_modules/AdbcDefines.cmake
+++ b/c/cmake_modules/AdbcDefines.cmake
@@ -21,7 +21,6 @@
enable_language(C CXX)
set(BUILD_SUPPORT_DIR "${REPOSITORY_ROOT}/ci/build_support")
-set(CMAKE_CXX_STANDARD 17)
include(AdbcVersion)
include(CheckLinkerFlag)
@@ -79,6 +78,8 @@ if(ADBC_BUILD_TESTS)
find_package(GTest)
if(NOT GTest_FOUND)
message(STATUS "Building googletest from source")
+ # Required for GoogleTest
+ set(CMAKE_CXX_STANDARD 17)
include(FetchContent)
fetchcontent_declare(googletest
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip