Merge pull request #1794 from vrabaud:2.4

11 years ago · 01f8645bc8
parent be88b20154 8e944cfe70
commit 01f8645bc8
1 changed files with 3 additions and 1 deletions
--- a/cmake/templates/OpenCVConfig.cmake.in
+++ b/cmake/templates/OpenCVConfig.cmake.in
@ -41,7 +41,9 @@ if(ANDROID)
  string(REPLACE - _ modules_file_suffix "_${ANDROID_NDK_ABI_NAME}")
 endif()

-include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
+if(NOT TARGET opencv_core)
+  include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${modules_file_suffix}.cmake)
+endif()

 # TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)