From 73530676cc0f999902e672338038ca13fa346c09 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Thu, 3 Aug 2023 15:17:18 +0400 Subject: [PATCH] Use OpenCV_DIR from cache only if user doesn't define OpenCV_DIR (#18963) --- .../InferenceEngineDeveloperPackageConfig.cmake.in | 7 +++++-- cmake/templates/OpenVINODeveloperPackageConfig.cmake.in | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in b/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in index 56a610cc39e..eefb5a4e132 100644 --- a/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in +++ b/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in @@ -151,8 +151,11 @@ endif() unset(_IE_nlohmann_json_FOUND) # inherit OpenCV from main IE project if enabled -if ("@OpenCV_FOUND@") - load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR) +if("@OpenCV_FOUND@") + # Use OpenCV_DIR from cache only if user doesn't define OpenCV_DIR + if(NOT OpenCV_DIR) + load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR) + endif() find_dependency(OpenCV) endif() diff --git a/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in b/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in index c6decaf418e..ab9ff478b10 100644 --- a/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in +++ b/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in @@ -71,8 +71,11 @@ foreach(component @openvino_export_components@) endforeach() # inherit OpenCV from main OpenVINO project if enabled -if ("@OpenCV_FOUND@") - load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR) +if("@OpenCV_FOUND@") + # Use OpenCV_DIR from cache only if user doesn't define OpenCV_DIR + if(NOT OpenCV_DIR) + load_cache("${cache_path}" READ_WITH_PREFIX "" OpenCV_DIR) + endif() find_dependency(OpenCV) endif()