Support cmake 3.30

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Point72 · Jul 22, 2024 · e34ef49 · e34ef49
1 parent fae9092
commit e34ef49
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml
@@ -60,7 +60,7 @@ runs:
         - name: Setup cmake
           uses: jwlawson/actions-setup-cmake@v2
           with:
-              cmake-version: "3.29.6"
+              cmake-version: "3.30.0"
 
         - name: Install pnpm
           uses: pnpm/action-setup@v3

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,6 +16,7 @@ on:
     push:
         branches:
             - master
+            - tkp/cmake30
         tags:
             - v*
         paths-ignore:

diff --git a/cmake/patches/0001-fix-absl.patch b/cmake/patches/0001-fix-absl.patch
@@ -0,0 +1,24 @@
+From cc84e46a15ddd33fd77a5bc9d3c6a9c3c6ab4080 Mon Sep 17 00:00:00 2001
+From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
+Date: Mon, 15 Jul 2024 22:01:28 -0400
+Subject: [PATCH] .
+
+---
+ third_party/abseil-cpp/absl/container/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/abseil-cpp/absl/container/CMakeLists.txt b/third_party/abseil-cpp/absl/container/CMakeLists.txt
+index 128cc0e9..11d65d55 100644
+--- a/third_party/abseil-cpp/absl/container/CMakeLists.txt
++++ b/third_party/abseil-cpp/absl/container/CMakeLists.txt
+@@ -213,6 +213,7 @@ absl_cc_library(
+   DEPS
+     absl::config
+     GTest::gmock
++  TESTONLY
+ )
+
+ absl_cc_test(
+--
+2.44.0
+
diff --git a/cmake/protobuf.txt.in b/cmake/protobuf.txt.in
@@ -17,6 +17,7 @@ ExternalProject_Add(protobuf
   SOURCE_DIR        "${CMAKE_BINARY_DIR}/protobuf-src"
   BINARY_DIR        "${CMAKE_BINARY_DIR}/protobuf-build"
   CONFIGURE_COMMAND ""
+  PATCH_COMMAND     git apply ${PSP_CMAKE_MODULE_PATH}/patches/0001-fix-absl.patch
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""

diff --git a/cpp/protos/CMakeLists.txt b/cpp/protos/CMakeLists.txt
@@ -23,6 +23,8 @@ if(NOT DEFINED PSP_CMAKE_MODULE_PATH)
     message(STATUS "PSP_CMAKE_MODULE_PATH not defined, using ${PSP_CMAKE_MODULE_PATH}")
 endif()
 
+set(protobuf_BUILD_TESTS OFF)
+set(ABSL_MSVC_STATIC_RUNTIME ON)
 psp_build_dep("protobuf" "${PSP_CMAKE_MODULE_PATH}/protobuf.txt.in")
 
 set(PROTO_FILES perspective.proto)
@@ -31,4 +33,4 @@ protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
 add_library(protos STATIC ${PROTO_SRCS} ${PROTO_HDRS})
 target_include_directories(protos PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/protobuf-src/src)
 target_include_directories(protos PUBLIC ${CMAKE_BINARY_DIR}/protos-build)
-target_link_libraries(protos protobuf::libprotobuf)
+target_link_libraries(protos protobuf::libprotobuf)
diff --git a/rust/perspective-client/Cargo.toml b/rust/perspective-client/Cargo.toml
@@ -39,7 +39,7 @@ path = "src/rust/lib.rs"
 
 [build-dependencies]
 prost-build = { version = "0.12.3" }
-protobuf-src = { version = "2.0.1", optional = true }
+protobuf-src = { version = "2.1.0+27.1", optional = true }
 
 [dependencies]
 async-lock = { version = "2.5.0" }