Skip to content

Commit 3d7834b

Browse files
lopsided98copybara-github
authored andcommitted
Import #128
Manual import. The Google-internal repo is the source of truth for pybind11_protobuf. Sorry we didn't get to automating imports from GitHub PRs. PiperOrigin-RevId: 560782973
1 parent b2e7687 commit 3d7834b

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

CMakeLists.txt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@ find_package(Python COMPONENTS Interpreter Development)
2727
# Build dependencies
2828

2929
set(_absl_repository "https://github.com/abseil/abseil-cpp.git")
30-
set(_absl_version 20220623.1)
31-
set(_absl_tag 20220623.1)
30+
set(_absl_version 20230125)
31+
set(_absl_tag 20230125.3)
32+
find_package(absl ${_absl_version} QUIET)
3233

3334
set(_protobuf_repository "https://github.com/protocolbuffers/protobuf.git")
34-
set(_protobuf_version 21.5)
35-
set(_protobuf_tag v21.5)
35+
set(_protobuf_version 3.23.3)
36+
set(_protobuf_tag v23.3)
37+
find_package(Protobuf ${_protobuf_version} QUIET)
3638

3739
set(_pybind11_repository "https://github.com/pybind/pybind11.git")
38-
set(_pybind11_version 2.10)
39-
set(_pybind11_tag v2.10.1)
40+
set(_pybind11_version 2.11.1)
41+
set(_pybind11_tag v2.11.1)
42+
find_package(pybind11 ${_pybind11_version} QUIET)
4043

4144
add_subdirectory(cmake/dependencies dependencies)
4245

cmake/dependencies/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ include(FetchContent)
33
# ============================================================================
44
# Declare all dependencies first
55

6-
find_package(absl ${_absl_version} EXACT QUIET)
76
if(NOT absl_FOUND)
87
set(ABSL_PROPAGATE_CXX_STD ON)
8+
set(ABSL_ENABLE_INSTALL ON)
99
FetchContent_Declare(
1010
absl
1111
GIT_REPOSITORY ${_absl_repository}
@@ -15,7 +15,6 @@ endif()
1515
# https://stackoverflow.com/questions/63309544/cmake-protobuf-external-to-application-code
1616
# https://cmake.org/cmake/help/latest/policy/CMP0077.html
1717
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7565/diffs
18-
find_package(Protobuf ${_protobuf_version} EXACT QUIET)
1918
if(NOT Protobuf_FOUND)
2019
set(protobuf_BUILD_TESTS
2120
OFF
@@ -27,7 +26,6 @@ if(NOT Protobuf_FOUND)
2726
GIT_SUBMODULES "")
2827
endif()
2928

30-
find_package(pybind11 ${_pybind11_version} EXACT QUIET)
3129
if(NOT pybind11_FOUND)
3230
set(PYBIND11_TEST OFF)
3331
FetchContent_Declare(

0 commit comments

Comments
 (0)