mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-18 19:38:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

world build: fix modules instantiation order

Browse Source 
opencv_hal before opencv_world
opencv_world before opencv_ts
This commit is contained in:
Alexander Alekhin 2015-12-12 14:56:59 +03:00
parent 1836d41b5c
commit 7afce8e003
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/OpenCVModule.cmake
View File

@ -305,9 +305,10 @@ macro(ocv_glob_modules)
set(OPENCV_INITIAL_PASS OFF PARENT_SCOPE) set(OPENCV_INITIAL_PASS OFF PARENT_SCOPE)
set(OPENCV_INITIAL_PASS OFF) set(OPENCV_INITIAL_PASS OFF)
if(${BUILD_opencv_world}) if(${BUILD_opencv_world})
add_subdirectory("${OPENCV_MODULE_opencv_world_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/world")
foreach(m ${OPENCV_MODULES_BUILD}) foreach(m ${OPENCV_MODULES_BUILD})
if(NOT OPENCV_MODULE_${m}_IS_PART_OF_WORLD AND NOT ${m} STREQUAL opencv_world) if("${m}" STREQUAL opencv_world)
add_subdirectory("${OPENCV_MODULE_opencv_world_LOCATION}" "${CMAKE_CURRENT_BINARY_DIR}/world")
elseif(NOT OPENCV_MODULE_${m}_IS_PART_OF_WORLD AND NOT ${m} STREQUAL opencv_world)
message(STATUS "Processing module ${m}...") message(STATUS "Processing module ${m}...")
if(m MATCHES "^opencv_") if(m MATCHES "^opencv_")
string(REGEX REPLACE "^opencv_" "" __shortname "${m}") string(REGEX REPLACE "^opencv_" "" __shortname "${m}")
@ -446,6 +447,17 @@ function(__ocv_resolve_dependencies)
list(APPEND deps_${m} ${d}) list(APPEND deps_${m} ${d})
set(has_changes ON) set(has_changes ON)
endif() endif()
if(BUILD_opencv_world
AND NOT "${m}" STREQUAL "opencv_world"
AND NOT "${m2}" STREQUAL "opencv_world"
AND OPENCV_MODULE_${m2}_IS_PART_OF_WORLD
AND NOT OPENCV_MODULE_${m}_IS_PART_OF_WORLD)
if(NOT (";${deps_${m}};" MATCHES ";opencv_world;"))
# message(STATUS " Transfer dependency opencv_world alias ${m2} to ${m}")
list(APPEND deps_${m} opencv_world)
set(has_changes ON)
endif()
endif()
endforeach() endforeach()
endif() endif()
endforeach() endforeach()