Second attempt to fix CVS-50011 (#4659)

* Second attemp to fix CVS-50011

* Clarified OpenCV dependencies

* Fixes
This commit is contained in:
Ilya Lavrenov 2021-03-15 13:04:20 +03:00 committed by GitHub
parent 8e080d4504
commit 753f4d5918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions

View File

@ -12,7 +12,7 @@ file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
add_library(${TARGET_NAME} SHARED ${HEADERS} ${SOURCES})
# Find OpenCV components if exist
find_package(OpenCV COMPONENTS imgcodecs videoio QUIET)
find_package(OpenCV COMPONENTS core imgproc imgcodecs QUIET)
if(NOT OpenCV_FOUND)
message(WARNING "OPENCV is disabled or not found, ${TARGET_NAME} is built without OPENCV support")
else()

View File

@ -5,7 +5,7 @@
set(TARGET_NAME "InferenceEngineCAPITests")
# Find OpenCV components if exist
find_package(OpenCV COMPONENTS imgcodecs videoio imgproc QUIET)
find_package(OpenCV COMPONENTS core imgproc imgcodecs QUIET)
if(NOT OpenCV_FOUND)
message(WARNING "OPENCV is disabled or not found, ${TARGET_NAME} is disabled")
return()

View File

@ -9,4 +9,4 @@ ie_add_sample(NAME benchmark_app
SOURCES ${SRC}
HEADERS ${HDR}
DEPENDENCIES format_reader
OPENCV_DEPENDENCIES imgcodecs)
OPENCV_DEPENDENCIES core)

View File

@ -21,7 +21,7 @@ source_group("include" FILES ${LIBRARY_HEADERS})
add_library(${TARGET_NAME} SHARED ${MAIN_SRC} ${LIBRARY_HEADERS})
# Find OpenCV components if exist
find_package(OpenCV COMPONENTS imgcodecs videoio imgproc QUIET)
find_package(OpenCV COMPONENTS core imgproc imgcodecs QUIET)
if(NOT OpenCV_FOUND)
message(WARNING "OPENCV is disabled or not found, ${TARGET_NAME} will be built without OPENCV support")
else()

View File

@ -4,4 +4,4 @@
ie_add_sample(NAME hello_classification
SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
OPENCV_DEPENDENCIES imgcodecs)
OPENCV_DEPENDENCIES core imgcodecs)

View File

@ -15,7 +15,7 @@
ie_add_sample(NAME hello_reshape_ssd
SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/reshape_ssd_extension.hpp"
OPENCV_DEPENDENCIES imgcodecs)
OPENCV_DEPENDENCIES core imgproc imgcodecs)
find_package(ngraph REQUIRED)
target_link_libraries(hello_reshape_ssd PRIVATE ${NGRAPH_LIBRARIES})

View File

@ -5,7 +5,7 @@
set(TARGET_NAME ieUnitTests)
# Find OpenCV components if exist
find_package(OpenCV COMPONENTS imgcodecs videoio imgproc QUIET)
find_package(OpenCV COMPONENTS core QUIET)
if(NOT OpenCV_FOUND)
message(WARNING "OPENCV is disabled or not found, ${TARGET_NAME} needs OpenCV for its build")
else()

View File

@ -33,7 +33,7 @@ if(ENABLE_MKL_DNN)
endif()
# Find OpenCV components if exist
find_package(OpenCV COMPONENTS imgcodecs imgproc QUIET)
find_package(OpenCV COMPONENTS core imgproc QUIET)
if(OpenCV_FOUND)
target_compile_definitions(${TARGET_NAME} PUBLIC USE_OPENCV)
else()