diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index 094cbd4d05..5d5635119c 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)