This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push:
new 3c484ec98 ORC-1983: [C++] Upgrade `gtest` to 1.17.0
3c484ec98 is described below
commit 3c484ec981a7255cc2264e60fbbe398966f490cb
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Fri Aug 29 14:33:39 2025 -0700
ORC-1983: [C++] Upgrade `gtest` to 1.17.0
### What changes were proposed in this pull request?
This PR aims to upgrade `gtest` to 1.17.0.
### Why are the changes needed?
To use the latest improved and bug fixed versions.
- https://github.com/google/googletest/releases/tag/v1.17.0 (Minimum
Requirement: C++17)
- https://github.com/google/googletest/releases/tag/v1.16.0 (Minimum
Requirement: C++14)
- https://github.com/google/googletest/releases/tag/v1.15.0 (Minimum
Requirement: C++14)
- https://github.com/google/googletest/releases/tag/v1.14.0 (Minimum
Requirement: C++14)
- https://github.com/google/googletest/releases/tag/v1.13.0 (Minimum
Requirement: C++14)
For the record, Apache ORC 1.9+ has been enforcing C++ 17+.
- #1295
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #2367 from dongjoon-hyun/ORC-1983.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
cmake_modules/ThirdpartyToolchain.cmake | 4 ++--
subprojects/gtest.wrap | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cmake_modules/ThirdpartyToolchain.cmake
b/cmake_modules/ThirdpartyToolchain.cmake
index 007e54b3b..851cdc4c2 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -23,7 +23,7 @@ set(ORC_FORMAT_VERSION "1.1.1")
set(LZ4_VERSION "1.10.0")
set(SNAPPY_VERSION "1.2.2")
set(ZLIB_VERSION "1.3.1")
-set(GTEST_VERSION "1.12.1")
+set(GTEST_VERSION "1.17.0")
set(PROTOBUF_VERSION "3.5.1")
set(ZSTD_VERSION "1.5.7")
set(SPARSEHASH_VERSION "2.11.1")
@@ -441,7 +441,7 @@ if (BUILD_CPP_TESTS)
set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
set(GMOCK_STATIC_LIB
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GTEST_STATIC_LIB
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
- set(GTEST_SRC_URL
"https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz";)
+ set(GTEST_SRC_URL
"https://github.com/google/googletest/archive/refs/tags/v${GTEST_VERSION}.tar.gz";)
if(APPLE)
set(GTEST_CMAKE_CXX_FLAGS " -DGTEST_USE_OWN_TR1_TUPLE=1
-Wno-unused-value -Wno-ignored-attributes")
else()
diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap
index a0e99a1a2..2406c2c1c 100644
--- a/subprojects/gtest.wrap
+++ b/subprojects/gtest.wrap
@@ -16,14 +16,15 @@
# under the License.
[wrap-file]
-directory = googletest-release-1.12.1
-source_url = https://github.com/google/googletest/archive/release-1.12.1.tar.gz
-source_filename = gtest-1.12.1.tar.gz
-source_hash = 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2
-patch_filename = gtest_1.12.1-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.12.1-1/get_patch
-patch_hash = 75143f11e174952bc768699fde3176511fe8e33b25dc6f6347d89e41648e99cf
-wrapdb_version = 1.12.1-1
+directory = googletest-1.17.0
+source_url =
https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
+source_filename = googletest-1.17.0.tar.gz
+source_hash = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
+patch_filename = gtest_1.17.0-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-3/get_patch
+patch_hash = 3e2799683f27c6dce138b7bae823416581c467ddde755c9a516c0863225f0ceb
+source_fallback_url =
https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-3/googletest-1.17.0.tar.gz
+wrapdb_version = 1.17.0-3
[provide]
gtest = gtest_dep
