Merge pull request #1794 from vrabaud:2.4

01f8645b · Roman Donchenko · OpenCV Buildbot · be88b201 · 8e944cfe · 01f8645b
Commit 01f8645b authored Nov 14, 2013 by Roman Donchenko Committed by OpenCV Buildbot Nov 14, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVConfig.cmake.in cmake/templates/OpenCVConfig.cmake.in +3 -1

No files found.
--- 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)