This is an automated email from the ASF dual-hosted git repository.
alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 41ee4221e Update CMake to 3.25.3
41ee4221e is described below
commit 41ee4221e467b7eac783422e5e056d6559218989
Author: Zoltan Martonka <[email protected]>
AuthorDate: Thu Aug 15 10:49:42 2024 +0000
Update CMake to 3.25.3
Reason for update:
We need glog 0.7.0 for newer g++ to fix a symbol demangling problem.
glog requires a higher version of CMake.
We also have to stay compatible with Ubuntu 18.04.
3.26 is no longer supports 18.04:
https://discourse.cmake.org/t/newest-cmake-not-available-from-apt-kitware-com-for-ubuntu-18-04/8272
So, 3.25 is the newest we can go.
Tested:
debug, release, tsan, asan on ubuntu 18.04, 20.04, 22.04, rhel 8.10,
9.2, SLES12 SP5, SLES15 SP5
Change-Id: I563e188b6692ebfe0e0b3e98577961a8380f1f31
Reviewed-on: http://gerrit.cloudera.org:8080/21569
Tested-by: Alexey Serbin <[email protected]>
Reviewed-by: Alexey Serbin <[email protected]>
---
build-support/dist_test.py | 2 ++
thirdparty/vars.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/build-support/dist_test.py b/build-support/dist_test.py
index 94c850c5c..29f666bbf 100755
--- a/build-support/dist_test.py
+++ b/build-support/dist_test.py
@@ -219,6 +219,8 @@ def get_test_executions(tests_regex, extra_args=None):
argv.extend(extra_args)
# Next line should b the 'Environment variables' heading
l = lines.popleft()
+ if "Working Directory:" in l: # ctest 3.10+ may print this line too
+ l = lines.popleft()
if "Environment variables:" not in l:
raise Exception("Unexpected line in ctest -V output: %s" % l)
# Following lines should be environment variable pairs.
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 0218d141c..a19d039f1 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -60,7 +60,7 @@ PROTOBUF_SOURCE=$TP_SOURCE_DIR/$PROTOBUF_NAME
# Note: CMake gets patched on SLES12SP0. When changing the CMake version,
please check if
# cmake-issue-15873-dont-use-select.patch needs to be updated.
-CMAKE_VERSION=3.19.1
+CMAKE_VERSION=3.25.3
CMAKE_NAME=cmake-$CMAKE_VERSION
CMAKE_SOURCE=$TP_SOURCE_DIR/$CMAKE_NAME
