Blame: patches/pybind11_protobuf.patch - google/or-tools

Google's Operations Research tools:

0 0 0 C++

reformat linear_solver python code to BLACK; support pybind11_protobuf 2023-06-28 15:57:54 +02:00			`diff --git a/CMakeLists.txt b/CMakeLists.txt`
backport from main 2024-09-30 17:28:08 +02:00			`index 2139dc0..df3f30a 100644`
reformat linear_solver python code to BLACK; support pybind11_protobuf 2023-06-28 15:57:54 +02:00			`--- a/CMakeLists.txt`
			`+++ b/CMakeLists.txt`
backport from main 2024-09-30 17:28:08 +02:00			`@@ -27,58 +27,64 @@ include(CTest)`
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`# ============================================================================`
			`# Find Python`
update third_party 2023-12-19 15:01:20 +01:00
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`-find_package(Python COMPONENTS Interpreter Development)`
			`+find_package(Python3 COMPONENTS Interpreter Development.Module)`
update third_party 2023-12-19 15:01:20 +01:00
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`# ============================================================================`
			`# Build dependencies`
backport from main 2024-09-30 17:28:08 +02:00			`+include(FetchContent)`

			`-if(USE_SYSTEM_ABSEIL)`
			`- # Version omitted, as absl only allows EXACT version matches`
			`- set(_absl_package_args REQUIRED)`
			`-else()`
			`- set(_absl_package_args 20230125)`
			`-endif()`
			`-if(USE_SYSTEM_PROTOBUF)`
			`- set(_protobuf_package_args 4.23.3 REQUIRED)`
			`-else()`
			`- set(_protobuf_package_args 4.23.3)`
			`-endif()`
			`-if(USE_SYSTEM_PYBIND)`
			`- set(_pybind11_package_args 2.11.1 REQUIRED)`
			`-else()`
			`- set(_pybind11_package_args 2.11.1)`
			`+message(CHECK_START "Checking for external dependencies")`
			`+list(APPEND CMAKE_MESSAGE_INDENT " ")`
			`+`
			`+if(NOT TARGET absl::base)`
			`+ if(USE_SYSTEM_ABSEIL)`
			`+ # Version omitted, as absl only allows EXACT version matches`
			`+ set(_absl_package_args REQUIRED)`
			`+ else()`
			`+ set(_absl_package_args 20230125)`
			`+ endif()`
			`+ FetchContent_Declare(`
			`+ absl`
			`+ GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"`
			`+ GIT_TAG 20230125.3`
			`+ FIND_PACKAGE_ARGS ${_absl_package_args} NAMES absl)`
			`+ set(ABSL_PROPAGATE_CXX_STD ON)`
			`+ set(ABSL_ENABLE_INSTALL ON)`
			`+ FetchContent_MakeAvailable(absl)`
			`endif()`

			`-set(ABSL_PROPAGATE_CXX_STD ON)`
			`-set(ABSL_ENABLE_INSTALL ON)`
			`+if(NOT TARGET protobuf::libprotobuf)`
			`+ if(USE_SYSTEM_PROTOBUF)`
			`+ set(_protobuf_package_args 4.23.3 REQUIRED)`
			`+ else()`
			`+ set(_protobuf_package_args 4.23.3)`
			`+ endif()`
			`+ FetchContent_Declare(`
			`+ Protobuf`
			`+ GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"`
			`+ GIT_TAG v23.3`
			`+ GIT_SUBMODULES ""`
			`+ FIND_PACKAGE_ARGS ${_protobuf_package_args} NAMES protobuf)`
			`+ set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")`
			`+ FetchContent_MakeAvailable(Protobuf)`
			`+endif()`

			`-include(FetchContent)`
			`-FetchContent_Declare(`
			`- absl`
			`- GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"`
			`- GIT_TAG 20230125.3`
			`- FIND_PACKAGE_ARGS ${_absl_package_args} NAMES absl)`
			`-`
			`-# cmake-format: off`
			`-FetchContent_Declare(`
			`- Protobuf`
			`- GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"`
			`- GIT_TAG v23.3`
			`- GIT_SUBMODULES ""`
			`- FIND_PACKAGE_ARGS ${_protobuf_package_args} NAMES protobuf)`
			`-set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")`
			`-# cmake-format: on`
			`-`
			`-FetchContent_Declare(`
			`- pybind11`
			`- GIT_REPOSITORY "https://github.com/pybind/pybind11.git"`
			`- GIT_TAG v2.11.1`
			`- FIND_PACKAGE_ARGS ${_pybind11_package_args} NAMES pybind11)`
			`+if(NOT TARGET pybind11::pybind11_headers)`
			`+ if(USE_SYSTEM_PYBIND)`
			`+ set(_pybind11_package_args 2.11.1 REQUIRED)`
			`+ else()`
			`+ set(_pybind11_package_args 2.11.1)`
			`+ endif()`
			`+ FetchContent_Declare(`
			`+ pybind11`
			`+ GIT_REPOSITORY "https://github.com/pybind/pybind11.git"`
			`+ GIT_TAG v2.11.1`
			`+ FIND_PACKAGE_ARGS ${_pybind11_package_args} NAMES pybind11)`
			`+ FetchContent_MakeAvailable(pybind11)`
			`+endif()`

			`-message(CHECK_START "Checking for external dependencies")`
			`-list(APPEND CMAKE_MESSAGE_INDENT " ")`
			`-FetchContent_MakeAvailable(absl Protobuf pybind11)`
			`list(POP_BACK CMAKE_MESSAGE_INDENT)`
			`+message(CHECK_PASS "found")`

			`# ============================================================================`
			`# pybind11_proto_utils pybind11 extension module`
			`@@ -87,8 +93,10 @@ pybind11_add_module(`
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`pybind11_protobuf/proto_utils.h)`
update third_party 2023-12-19 15:01:20 +01:00
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`target_link_libraries(`
			`- pybind11_proto_utils PRIVATE absl::strings protobuf::libprotobuf`
			`- ${Python_LIBRARIES})`
			`+ pybind11_proto_utils PRIVATE`
			`+ absl::strings`
			`+ protobuf::libprotobuf`
			`+ Python3::Module)`
update third_party 2023-12-19 15:01:20 +01:00
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`target_include_directories(`
			`pybind11_proto_utils PRIVATE ${PROJECT_SOURCE_DIR} ${protobuf_INCLUDE_DIRS}`
backport from main 2024-09-30 17:28:08 +02:00			`@@ -116,10 +124,11 @@ target_link_libraries(`
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`absl::optional`
			`protobuf::libprotobuf`
			`pybind11::pybind11`
			`- ${Python_LIBRARIES})`
			`+ Python3::Module)`
update third_party 2023-12-19 15:01:20 +01:00
reformat linear_solver python code to BLACK; support pybind11_protobuf 2023-06-28 15:57:54 +02:00			`target_include_directories(`
			`pybind11_native_proto_caster`
partial sync with main (without the routing part) 2024-07-12 13:56:11 +02:00			`+ PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>`
reformat linear_solver python code to BLACK; support pybind11_protobuf 2023-06-28 15:57:54 +02:00			`PRIVATE ${PROJECT_SOURCE_DIR} ${protobuf_INCLUDE_DIRS} ${protobuf_SOURCE_DIR}`
			`${pybind11_INCLUDE_DIRS})`
update third_party 2023-12-19 15:01:20 +01:00
backport from main 2024-09-30 17:28:08 +02:00			`@@ -143,7 +152,7 @@ target_link_libraries(`
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`absl::optional`
			`protobuf::libprotobuf`
			`pybind11::pybind11`
			`- ${Python_LIBRARIES})`
			`+ Python3::Module)`
update third_party 2023-12-19 15:01:20 +01:00
cmake: Fix pybind11_protobuf patch * get rid of ${Python_LIBRARIES} (ed unavailable on manylinux) note: module shouldn't link against libpython.so but only depends on python.h since it will be dynamic loaded in the python process which already have the python symbols loaded... 2023-07-24 15:52:24 +02:00			`target_include_directories(`
			`pybind11_wrapped_proto_caster`