mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 14:39:01 +08:00
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
--- a/cmake/OpenCVFindProtobuf.cmake
|
||
|
|
+++ b/cmake/OpenCVFindProtobuf.cmake
|
||
|
|
@@ -44,17 +44,6 @@ else()
|
||
|
|
# end of compatibility block
|
||
|
|
|
||
|
|
if(Protobuf_FOUND)
|
||
|
|
- if(TARGET protobuf::libprotobuf)
|
||
|
|
- add_library(libprotobuf INTERFACE)
|
||
|
|
- target_link_libraries(libprotobuf INTERFACE protobuf::libprotobuf)
|
||
|
|
- else()
|
||
|
|
- add_library(libprotobuf UNKNOWN IMPORTED)
|
||
|
|
- set_target_properties(libprotobuf PROPERTIES
|
||
|
|
- IMPORTED_LOCATION "${Protobuf_LIBRARY}"
|
||
|
|
- INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}"
|
||
|
|
- )
|
||
|
|
- get_protobuf_version(Protobuf_VERSION "${Protobuf_INCLUDE_DIR}")
|
||
|
|
- endif()
|
||
|
|
set(HAVE_PROTOBUF TRUE)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
--- a/modules/dnn/CMakeLists.txt
|
||
|
|
+++ b/modules/dnn/CMakeLists.txt
|
||
|
|
@@ -65,7 +65,7 @@ endif()
|
||
|
|
|
||
|
|
ocv_module_include_directories(${fw_inc} ${CMAKE_CURRENT_LIST_DIR}/src/ocl4dnn/include ${OPENCL_INCLUDE_DIRS})
|
||
|
|
ocv_glob_module_sources(SOURCES ${fw_srcs})
|
||
|
|
-ocv_create_module(libprotobuf ${LAPACK_LIBRARIES})
|
||
|
|
+ocv_create_module()
|
||
|
|
ocv_add_samples()
|
||
|
|
ocv_add_accuracy_tests()
|
||
|
|
ocv_add_perf_tests()
|