From 020ad1ac7683954c1c51d5bd13ca093a1b9e06a4 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 22 May 2018 14:40:03 +0300 Subject: [PATCH] dnn: allow setting IE paths via command line --- cmake/OpenCVDetectInferenceEngine.cmake | 2 +- modules/dnn/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index 71bac96b47..d941ac2c8c 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -30,7 +30,7 @@ if(NOT INF_ENGINE_ROOT_DIR OR NOT EXISTS "${INF_ENGINE_ROOT_DIR}/include/inferen list(APPEND ie_root_paths "${INTEL_CVSDK_DIR}/inference_engine") endif() - if(WITH_INF_ENGINE AND NOT ie_root_paths) + if(NOT ie_root_paths) list(APPEND ie_root_paths "/opt/intel/deeplearning_deploymenttoolkit/deployment_tools/inference_engine") endif() diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt index fbcdd78308..9549439fd4 100644 --- a/modules/dnn/CMakeLists.txt +++ b/modules/dnn/CMakeLists.txt @@ -80,7 +80,7 @@ else() set(sources_options EXCLUDE_OPENCL) endif() -if(WITH_INF_ENGINE AND HAVE_INF_ENGINE) +if(HAVE_INF_ENGINE) add_definitions(-DHAVE_INF_ENGINE=1) list(APPEND include_dirs ${INF_ENGINE_INCLUDE_DIRS}) list(APPEND libs ${INF_ENGINE_LIBRARIES}) -- GitLab