From 47182ebba9d6790069ca268813e9044638a9033b Mon Sep 17 00:00:00 2001
From: Dark Dragon <darkdragon-001@web.de>
Date: Sat, 9 Sep 2023 16:43:34 +0200
Subject: [PATCH] Use find_package(Protobuf CONFIG)

---
 cpp/CMakeLists.txt        | 11 ++++++-----
 cpp/cmake/config.cmake.in |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 3d55a5677..e123ba42a 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -176,11 +176,11 @@ if (USE_RE2)
   find_required_library (RE2 re2/re2.h re2 "Google RE2")
 endif ()
 
-find_package(Protobuf REQUIRED)
+find_package(Protobuf CONFIG REQUIRED)
 if (USE_PROTOBUF_LITE)
-  set(PROTOBUF_LIB ${Protobuf_LITE_LIBRARIES})
+  set(PROTOBUF_LIB protobuf::libprotobuf-lite)
 else ()
-  set(PROTOBUF_LIB ${Protobuf_LIBRARIES})
+  set(PROTOBUF_LIB protobuf::libprotobuf)
 endif ()
 
 find_required_library (ICU_UC unicode/uchar.h icuuc "ICU")
@@ -233,8 +233,9 @@ set (
 )
 
 add_custom_command (
-  COMMAND ${Protobuf_PROTOC_EXECUTABLE} --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/
-    --proto_path=${RESOURCES_DIR} ${PROTOBUF_SOURCES}
+  COMMAND protobuf::protoc
+  ARGS --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/phonenumbers/ --proto_path=${RESOURCES_DIR} ${PROTOBUF_SOURCES}
+  VERBATIM
 
   OUTPUT ${PROTOBUF_OUTPUT}
   DEPENDS ${PROTOBUF_SOURCES}
diff --git a/cpp/cmake/config.cmake.in b/cpp/cmake/config.cmake.in
index 2cf7fc9bb..b91ce9836 100644
--- a/cpp/cmake/config.cmake.in
+++ b/cpp/cmake/config.cmake.in
@@ -3,7 +3,7 @@
 include(CMakeFindDependencyMacro)
 
 find_dependency(absl CONFIG)
-find_dependency(Protobuf)
+find_dependency(Protobuf CONFIG)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
 check_required_components("@PROJECT_NAME@")