mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
ca1501f4b2
Co-authored-by: Howard Su <howard0su@gmail.com> Co-authored-by: Nick Logozzo <nlogozzo225@gmail.com> Co-authored-by: sidy3d <sidy3d@users.noreply.github.com> Co-authored-by: c8ef <c8ef@outlook.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Matthias Kuhn <matthias@opengis.ch> Co-authored-by: Mark Harmstone <mark@harmstone.com> Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Alexandre Bique <bique.alexandre@gmail.com> Co-authored-by: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Co-authored-by: Jakub Melka <mgr.jakub.melka@gmail.com> Co-authored-by: LE GARREC Vincent <github@le-garrec.fr> Co-authored-by: Josh Harris <126129571+harris-josh@users.noreply.github.com> Co-authored-by: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com> Co-authored-by: Kaoru <shiinasama2001@gmail.com> Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com> Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local> Co-authored-by: Pravila <pravila0011@gmail.com> Co-authored-by: JacobBarthelmeh <jacob@wolfssl.com> Co-authored-by: myd7349 <myd7349@gmail.com> Co-authored-by: Billy O'Neal <bion@microsoft.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: 王太阳 <wangfangkai@qq.com> Co-authored-by: 王方凯 <fk.wang@hydro-tech.cn> Co-authored-by: Chuck Walbourn <walbourn@users.noreply.github.com> Co-authored-by: Jaap Aarts <JAicewizard@users.noreply.github.com>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
--- a/cmake/OpenCVFindProtobuf.cmake
|
|
+++ b/cmake/OpenCVFindProtobuf.cmake
|
|
@@ -34,7 +34,7 @@ else()
|
|
set(protobuf_MODULE_COMPATIBLE ON)
|
|
|
|
unset(Protobuf_VERSION CACHE)
|
|
- find_package(Protobuf QUIET CONFIG)
|
|
+ find_package(Protobuf CONFIG REQUIRED)
|
|
if(NOT Protobuf_FOUND)
|
|
find_package(Protobuf QUIET)
|
|
endif()
|
|
@@ -97,6 +97,7 @@ if(HAVE_PROTOBUF)
|
|
unset( __location)
|
|
if(TARGET "${Protobuf_LIBRARIES}")
|
|
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
|
|
+ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG)
|
|
if(NOT __location)
|
|
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
|
|
endif()
|
|
@@ -112,5 +113,5 @@ if(HAVE_PROTOBUF)
|
|
endif()
|
|
list(APPEND CUSTOM_STATUS_protobuf " Protobuf:"
|
|
BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
|
|
- ELSE "${__location} (${Protobuf_VERSION})")
|
|
+ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})")
|
|
endif()
|