Library versions & made tests relocatable (#12416)
* Fixes for cases when TBB_DIR env var is set * Don't use make in build_samples.sh script * First version of Windows installer * WIndows NSIS installer * Improved version of debian packages * Improvements * Improvements * Debian packages now look good * Library versioning * Fixed tests to run against debian packages * Fixed frontend tests * Fixed code style * FIxed Windows * Fixed python tests * Fixed paths in tests * fdvfdv * Fixes * USe versioning only for debian packages * Relocatable tests * Fixed * Fixed all tests * Fixed clang-format * Fixed more tests * Fixed some tests * Absolute paths in .ci * Fixes * Added support of OpenCV 3.4 * Trying to fix gnaUnitTests
This commit is contained in:
1 parent
b9126fe6ea
commit
6ca47b074d
87 files changed
+803
-712
No files matched your search
@@ -61,15 +61,9 @@ if(NOT CMAKE_CROSSCOMPILING)
|
||||
endif()
|
||||
|
||||
# remove OpenCV related sources
|
||||
if (ENABLE_OPENCV)
|
||||
find_package(OpenCV QUIET)
|
||||
else()
|
||||
set(OpenCV_FOUND OFF)
|
||||
endif()
|
||||
|
||||
find_package(OpenCV QUIET COMPONENTS core imgcodecs)
|
||||
if(NOT OpenCV_FOUND)
|
||||
list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/dldt_optimization_guide5.cpp"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/ShapeInference.cpp")
|
||||
list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ShapeInference.cpp")
|
||||
endif()
|
||||
|
||||
# requires mfxFrameSurface1 and MSS API
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#include <openvino/core/layout.hpp>
|
||||
#include <opencv2/core/core.hpp>
|
||||
#include <opencv2/imgcodecs.hpp>
|
||||
#include <opencv2/highgui.hpp>
|
||||
|
||||
int main() {
|
||||
ov::Core core;
|
||||
|
||||
Reference in new issue
Block a user