From 5b72e836877180bd0d15cc424ab5d7fc3650300e Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 17 Jul 2018 15:30:56 +0300 Subject: [PATCH] cmake: prefer using find_package(InferenceEngine) --- CMakeLists.txt | 12 +++++++++++- cmake/OpenCVDetectInferenceEngine.cmake | 9 +++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52a1081f37..898a837b77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1408,7 +1408,17 @@ if(WITH_HALIDE OR HAVE_HALIDE) endif() if(WITH_INF_ENGINE OR HAVE_INF_ENGINE) - status(" Inference Engine:" HAVE_INF_ENGINE THEN "YES (${INF_ENGINE_LIBRARIES} ${INF_ENGINE_INCLUDE_DIRS})" ELSE NO) + if(HAVE_INF_ENGINE) + set(__msg "YES") + if(DEFINED INF_ENGINE_VERSION) + set(__msg "YES (ver ${INF_ENGINE_VERSION})") + endif() + status(" Inference Engine:" "${__msg}") + status(" libs:" "${INF_ENGINE_LIBRARIES}") + status(" includes:" "${INF_ENGINE_INCLUDE_DIRS}") + else() + status(" Inference Engine:" "NO") + endif() endif() if(WITH_EIGEN OR HAVE_EIGEN) diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index 1c248b1cd9..366509ed39 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -20,6 +20,15 @@ if(NOT HAVE_CXX11) ie_fail() endif() +find_package(InferenceEngine QUIET) +if(InferenceEngine_FOUND) + set(INF_ENGINE_LIBRARIES "${InferenceEngine_LIBRARIES}") + set(INF_ENGINE_INCLUDE_DIRS "${InferenceEngine_INCLUDE_DIRS}") + set(INF_ENGINE_VERSION "${InferenceEngine_VERSION}") + set(HAVE_INF_ENGINE TRUE) + return() +endif() + ocv_check_environment_variables(INTEL_CVSDK_DIR INF_ENGINE_ROOT_DIR IE_PLUGINS_PATH) if(NOT INF_ENGINE_ROOT_DIR OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inference_engine.hpp")