Skip to content

Commit 0f41ecc

Browse files
kouassignUser
authored andcommitted
GH-45986: [C++] Update bundled GoogleTest (#45996)
### Rationale for this change The current bundle Google 1.11.0 was released in 2021. It's too old. ### What changes are included in this PR? Update to the latest GoogleTest: 1.16.0 ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #45986 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Raúl Cumplido <[email protected]>
1 parent 1e2aa39 commit 0f41ecc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/cpp.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ jobs:
210210
ARROW_WITH_SNAPPY: ON
211211
ARROW_WITH_ZLIB: ON
212212
ARROW_WITH_ZSTD: ON
213-
GTest_SOURCE: BUNDLED
214213
steps:
215214
- name: CPU Info
216215
run: |
@@ -406,7 +405,6 @@ jobs:
406405
# We can't use unity build because we don't have enough memory on
407406
# GitHub Actions.
408407
# CMAKE_UNITY_BUILD: ON
409-
GTest_SOURCE: BUNDLED
410408
steps:
411409
- name: Disable Crash Dialogs
412410
run: |

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,7 @@ if(DEFINED ENV{ARROW_GTEST_URL})
694694
set(GTEST_SOURCE_URL "$ENV{ARROW_GTEST_URL}")
695695
else()
696696
set_urls(GTEST_SOURCE_URL
697-
"https://github.com/google/googletest/archive/release-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
698-
"https://chromium.googlesource.com/external/github.com/google/googletest/+archive/release-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
697+
"https://github.com/google/googletest/releases/download/v${ARROW_GTEST_BUILD_VERSION}/googletest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
699698
"${THIRDPARTY_MIRROR_URL}/gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz")
700699
endif()
701700

@@ -2337,6 +2336,9 @@ function(build_gtest)
23372336
URL ${GTEST_SOURCE_URL}
23382337
URL_HASH "SHA256=${ARROW_GTEST_BUILD_SHA256_CHECKSUM}")
23392338
prepare_fetchcontent()
2339+
# We can remove this once we remove set(CMAKE_POLICY_VERSION_MINIMUM
2340+
# 3.5) from prepare_fetchcontent().
2341+
unset(CMAKE_POLICY_VERSION_MINIMUM)
23402342
if(APPLE)
23412343
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-value" " -Wno-ignored-attributes")
23422344
endif()

cpp/thirdparty/versions.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v2.22.0
7676
ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=0c68782e57959c82e0c81def805c01460a042c1aae0c2feee905acaa2a2dc9bf
7777
ARROW_GRPC_BUILD_VERSION=v1.46.3
7878
ARROW_GRPC_BUILD_SHA256_CHECKSUM=d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964
79-
ARROW_GTEST_BUILD_VERSION=1.11.0
80-
ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
79+
ARROW_GTEST_BUILD_VERSION=1.16.0
80+
ARROW_GTEST_BUILD_SHA256_CHECKSUM=78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399
8181
ARROW_JEMALLOC_BUILD_VERSION=5.3.0
8282
ARROW_JEMALLOC_BUILD_SHA256_CHECKSUM=2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa
8383
ARROW_LZ4_BUILD_VERSION=v1.10.0
@@ -149,7 +149,7 @@ DEPENDENCIES=(
149149
"ARROW_GLOG_URL glog-${ARROW_GLOG_BUILD_VERSION}.tar.gz https://github.com/google/glog/archive/${ARROW_GLOG_BUILD_VERSION}.tar.gz"
150150
"ARROW_GOOGLE_CLOUD_CPP_URL google-cloud-cpp-${ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION}.tar.gz https://github.com/googleapis/google-cloud-cpp/archive/${ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION}.tar.gz"
151151
"ARROW_GRPC_URL grpc-${ARROW_GRPC_BUILD_VERSION}.tar.gz https://github.com/grpc/grpc/archive/${ARROW_GRPC_BUILD_VERSION}.tar.gz"
152-
"ARROW_GTEST_URL gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz https://github.com/google/googletest/archive/release-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
152+
"ARROW_GTEST_URL gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz https://github.com/google/googletest/releases/download/v${ARROW_GTEST_BUILD_VERSION}/googletest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
153153
"ARROW_JEMALLOC_URL jemalloc-${ARROW_JEMALLOC_BUILD_VERSION}.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/${ARROW_JEMALLOC_BUILD_VERSION}/jemalloc-${ARROW_JEMALLOC_BUILD_VERSION}.tar.bz2"
154154
"ARROW_LZ4_URL lz4-${ARROW_LZ4_BUILD_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${ARROW_LZ4_BUILD_VERSION}.tar.gz"
155155
"ARROW_MIMALLOC_URL mimalloc-${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz https://github.com/microsoft/mimalloc/archive/${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz"

0 commit comments

Comments
 (0)