From f803c2a7bba0da9fa76b4007a263ef39bce8f080 Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@itseez.com>
Date: Wed, 8 Apr 2015 14:15:20 +0300
Subject: [PATCH] Generators: updated the library gathering loop

---
 cmake/OpenCVUtils.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
index b9b729e2b..e7d60beb9 100644
--- a/cmake/OpenCVUtils.cmake
+++ b/cmake/OpenCVUtils.cmake
@@ -798,17 +798,17 @@ macro(ocv_get_all_libs _modules _extra _3rdparty)
     get_target_property(deps ${m} INTERFACE_LINK_LIBRARIES)
     list(INSERT ${_modules} 0 ${deps} ${m})
     foreach (dep ${deps} ${OPENCV_LINKER_LIBS})
-      if (TARGET ${dep})
-        list(INSERT ${_3rdparty} 0 ${dep})
-      else()
-        list(INSERT ${_extra} 0 ${dep})
+      if (NOT DEFINED OPENCV_MODULE_${dep}_LOCATION)
+        if (TARGET ${dep})
+          list(INSERT ${_3rdparty} 0 ${dep})
+        else()
+          list(INSERT ${_extra} 0 ${dep})
+        endif()
       endif()
     endforeach()
   endforeach()
 
   # split 3rdparty libs and modules
-  ocv_list_filterout(${_3rdparty} "^opencv_.+$")
-  ocv_list_filterout(${_extra} "^opencv_.+$")
   list(REMOVE_ITEM ${_modules} ${${_3rdparty}} ${${_extra}})
 
   # convert CMake lists to makefile literals