From ee7c74ceeb2b28fdde0229b9f51d33071110a85d Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 13 Nov 2013 14:20:09 +0100 Subject: [PATCH] return when OpenCV is found --- cmake/templates/OpenCVConfig.cmake.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index 094cbd4..5d56351 100644 --- a/cmake/templates/OpenCVConfig.cmake.in +++ b/cmake/templates/OpenCVConfig.cmake.in @@ -37,15 +37,17 @@ # # =================================================================================== +if(OpenCV_FOUND) + return() +endif() +set(OpenCV_FOUND TRUE) + set(modules_file_suffix "") if(ANDROID) string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}") endif() -if(NOT OpenCV_FOUND) - include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake) - set(OpenCV_FOUND TRUE) -endif() +include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake) # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files) -- 2.7.4