mirror of https://github.com/microsoft/vcpkg.git
72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2b9ca8ed6..a9798c35e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -274,6 +274,7 @@ endif (protobuf_BUILD_TESTS)
|
|
include(${protobuf_SOURCE_DIR}/cmake/abseil-cpp.cmake)
|
|
|
|
if (protobuf_BUILD_PROTOBUF_BINARIES)
|
|
+ find_package(utf8_range CONFIG REQUIRED)
|
|
include(${protobuf_SOURCE_DIR}/cmake/utf8_range.cmake)
|
|
include(${protobuf_SOURCE_DIR}/cmake/libprotobuf-lite.cmake)
|
|
if (NOT DEFINED protobuf_LIB_PROTOBUF_LITE)
|
|
diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
|
|
index 6a923f6c8..d910c8499 100644
|
|
--- a/cmake/libprotobuf-lite.cmake
|
|
+++ b/cmake/libprotobuf-lite.cmake
|
|
@@ -43,4 +43,4 @@ set_target_properties(libprotobuf-lite PROPERTIES
|
|
)
|
|
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
|
|
|
|
-target_link_libraries(libprotobuf-lite PRIVATE utf8_validity)
|
|
+target_link_libraries(libprotobuf-lite PRIVATE utf8_range::utf8_validity)
|
|
diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
|
|
index 22df1fd14..ea9a1054b 100644
|
|
--- a/cmake/libprotobuf.cmake
|
|
+++ b/cmake/libprotobuf.cmake
|
|
@@ -45,4 +45,4 @@ set_target_properties(libprotobuf PROPERTIES
|
|
)
|
|
add_library(protobuf::libprotobuf ALIAS libprotobuf)
|
|
|
|
-target_link_libraries(libprotobuf PUBLIC utf8_validity)
|
|
+target_link_libraries(libprotobuf PUBLIC utf8_range::utf8_validity)
|
|
diff --git a/cmake/libupb.cmake b/cmake/libupb.cmake
|
|
index 1cbbaa209..4feb0345e 100644
|
|
--- a/cmake/libupb.cmake
|
|
+++ b/cmake/libupb.cmake
|
|
@@ -48,4 +48,4 @@ set_target_properties(libupb PROPERTIES
|
|
VISIBILITY_INLINES_HIDDEN ON
|
|
)
|
|
add_library(protobuf::libupb ALIAS libupb)
|
|
-target_link_libraries(libupb PRIVATE utf8_range)
|
|
+target_link_libraries(libupb PRIVATE utf8_range::utf8_range)
|
|
diff --git a/cmake/upb_generators.cmake b/cmake/upb_generators.cmake
|
|
index 7a55f851e..de897a079 100644
|
|
--- a/cmake/upb_generators.cmake
|
|
+++ b/cmake/upb_generators.cmake
|
|
@@ -24,7 +24,7 @@ foreach(generator upb upbdefs upb_minitable)
|
|
endif()
|
|
target_link_libraries(protoc-gen-${generator}
|
|
libprotobuf
|
|
- utf8_validity
|
|
+ utf8_range::utf8_validity
|
|
${protobuf_LIB_UPB}
|
|
${protobuf_ABSL_USED_TARGETS}
|
|
)
|
|
diff --git a/cmake/utf8_range.cmake b/cmake/utf8_range.cmake
|
|
index f411a8c5b..21bf8235b 100644
|
|
--- a/cmake/utf8_range.cmake
|
|
+++ b/cmake/utf8_range.cmake
|
|
@@ -1,4 +1,4 @@
|
|
-if (NOT TARGET utf8_range)
|
|
+if (0)
|
|
set(utf8_range_ENABLE_TESTS OFF CACHE BOOL "Disable utf8_range tests")
|
|
|
|
if (NOT EXISTS "${protobuf_SOURCE_DIR}/third_party/utf8_range/CMakeLists.txt")
|
|
@@ -12,4 +12,4 @@ if (NOT TARGET utf8_range)
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range)
|
|
endif ()
|
|
|
|
-set(_protobuf_FIND_UTF8_RANGE "if(NOT TARGET utf8_range)\n find_package(utf8_range CONFIG)\nendif()")
|
|
+set(_protobuf_FIND_UTF8_RANGE "if(NOT TARGET utf8_range::utf8_range)\n find_package(utf8_range CONFIG)\nendif()")
|