From 5d0c56c0d23177bd4d4bddf93d928ec0433ea545 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 11 Jun 2023 23:26:01 +0100 Subject: [PATCH 19/21] Use config mode search for protobuf first The recent versions of `libprotobuf` (>=4.22.0) provide their own CMake configs. We should check for the existence of the config and use the hand-rolled version as a fallback as it does not capture all deps. See also: https://gitlab.kitware.com/cmake/cmake/-/issues/24321 --- cmake/protobuf.cmake | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake index 8c6db02097e..a04942a321a 100644 --- a/cmake/protobuf.cmake +++ b/cmake/protobuf.cmake @@ -121,7 +121,19 @@ MACRO(MYSQL_CHECK_PROTOBUF) IF(WITH_PROTOBUF STREQUAL "bundled") MYSQL_USE_BUNDLED_PROTOBUF() ELSE() - FIND_PACKAGE(Protobuf) + FIND_PACKAGE(Protobuf CONFIG) + IF(Protobuf_FOUND) + SET(PROTOBUF_LIBRARY protobuf::libprotobuf) + SET(PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) + SET(PROTOBUF_LITE_LIBRARY protobuf::libprotobuf-lite) + IF(NOT PROTOBUF_PROTOC_EXECUTABLE) + SET(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc) + ENDIF() + GET_TARGET_PROPERTY(PROTOBUF_INCLUDE_DIR protobuf::libprotoc INTERFACE_INCLUDE_DIRECTORIES) + SET(PROTOBUF_FOUND 1) + ELSE() + FIND_PACKAGE(Protobuf) + ENDIF() ENDIF() IF(NOT PROTOBUF_FOUND) -- 2.41.0