From fdc1e87ddff66bafe01e43aff67f07fb73e33b2b Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 3 Feb 2012 18:52:00 +0000
Subject: [PATCH] Attempt to fix #1580 - building OpenCV with ffmpeg not in
 LD_LIBRARY_PATH

---
 cmake/OpenCVModule.cmake | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index ca8ff11e0b..b275235cbe 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -285,12 +285,21 @@ macro(ocv_glob_modules)
 
   #resolve dependencies
   __ocv_flatten_module_dependencies()
+  
+  #order modules by dependencies
+  set(OPENCV_MODULES_BUILD_ "")
+  foreach(m ${OPENCV_MODULES_BUILD})
+    list(APPEND OPENCV_MODULES_BUILD_ ${OPENCV_MODULE_${m}_DEPS} ${m})
+  endforeach()
+  ocv_list_unique(OPENCV_MODULES_BUILD_)
 
   #create modules
   set(OPENCV_INITIAL_PASS OFF)
-  foreach(m ${OPENCV_MODULES_BUILD})
-    string(REGEX REPLACE "^opencv_" "" __shortname "${m}")
-    add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/${__shortname}")
+  foreach(m ${OPENCV_MODULES_BUILD_})
+    if(m MATCHES "^opencv_")
+      string(REGEX REPLACE "^opencv_" "" __shortname "${m}")
+      add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/${__shortname}")
+    endif()
   endforeach()
   unset(__shortname)
 endmacro()