From 9007a02302809aefe5da9bd7f1bd2fd5a4640cf6 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 13 Nov 2013 12:25:44 +0100 Subject: [PATCH] fixes http://code.opencv.org/issues/3367 --- cmake/templates/OpenCVConfig.cmake.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index ee1eb59969..094cbd4d05 100644 --- a/cmake/templates/OpenCVConfig.cmake.in +++ b/cmake/templates/OpenCVConfig.cmake.in @@ -16,6 +16,7 @@ # If the module is found then OPENCV__FOUND is set to TRUE. # # This file will define the following variables: +# - OpenCV_FOUND : Set to TRUE is OpenCV was find_packaged before # - OpenCV_LIBS : The list of all imported targets for OpenCV modules. # - OpenCV_INCLUDE_DIRS : The OpenCV include directories. # - OpenCV_COMPUTE_CAPABILITIES : The version of compute capability @@ -41,7 +42,10 @@ if(ANDROID) string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}") endif() -include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake) +if(NOT OpenCV_FOUND) + include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake) + set(OpenCV_FOUND TRUE) +endif() # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)