Fixed world build with HAL

This commit is contained in:
Maksim Shabunin 2015-04-08 19:16:06 +03:00
parent 5b3f89df0a
commit e7c02f376f

View File

@ -9,6 +9,10 @@ else()
set(OPENCV_WORLD_FLAGS_PROPERTY LINK_FLAGS) set(OPENCV_WORLD_FLAGS_PROPERTY LINK_FLAGS)
endif() endif()
function(include_one_module m)
include("${OPENCV_MODULE_${m}_LOCATION}/CMakeLists.txt")
endfunction()
if(NOT OPENCV_INITIAL_PASS) if(NOT OPENCV_INITIAL_PASS)
project(opencv_world) project(opencv_world)
@ -18,7 +22,7 @@ if(NOT OPENCV_INITIAL_PASS)
message(STATUS " module ${m}...") message(STATUS " module ${m}...")
set(CMAKE_CURRENT_SOURCE_DIR ${OPENCV_MODULE_${m}_LOCATION}) set(CMAKE_CURRENT_SOURCE_DIR ${OPENCV_MODULE_${m}_LOCATION})
#add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" ${CMAKE_CURRENT_BINARY_DIR}/${m}) #add_subdirectory("${OPENCV_MODULE_${m}_LOCATION}" ${CMAKE_CURRENT_BINARY_DIR}/${m})
include("${OPENCV_MODULE_${m}_LOCATION}/CMakeLists.txt") include_one_module(${m})
endif() endif()
endforeach() endforeach()
message(STATUS "Processing WORLD modules... DONE") message(STATUS "Processing WORLD modules... DONE")