generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4095 from alalek:hal_unresolved_symbols

Browse Source
This commit is contained in:
Maksim Shabunin 2015-06-17 14:35:40 +00:00
commit 7bfd070864
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVModule.cmake
View File

@ -176,15 +176,11 @@ macro(ocv_add_module _name)
endif() endif()
endif() endif()
# add HAL as dependency
if(NOT "${the_module}" STREQUAL "opencv_hal")
ocv_add_dependencies(${the_module} opencv_hal)
endif()
# add self to the world dependencies # add self to the world dependencies
if((NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD if((NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD
AND NOT OPENCV_MODULE_${the_module}_CLASS STREQUAL "BINDINGS" AND NOT OPENCV_MODULE_${the_module}_CLASS STREQUAL "BINDINGS"
AND NOT OPENCV_PROCESSING_EXTRA_MODULES) AND NOT OPENCV_PROCESSING_EXTRA_MODULES
AND (NOT BUILD_SHARED_LIBS OR NOT "x${OPENCV_MODULE_TYPE}" STREQUAL "xSTATIC"))
OR OPENCV_MODULE_IS_PART_OF_WORLD OR OPENCV_MODULE_IS_PART_OF_WORLD
) )
set(OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD ON CACHE INTERNAL "") set(OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD ON CACHE INTERNAL "")

6
modules/core/CMakeLists.txt
View File

@ -1,7 +1,9 @@
set(the_description "The Core Functionality") set(the_description "The Core Functionality")
ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}" ocv_add_module(core
opencv_hal
PRIVATE_REQUIRED ${ZLIB_LIBRARIES} "${OPENCL_LIBRARIES}"
OPTIONAL opencv_cudev OPTIONAL opencv_cudev
WRAP java python) WRAP java python)
set(extra_libs "") set(extra_libs "")

1
modules/hal/CMakeLists.txt
View File

@ -1,7 +1,6 @@
set(the_description "The Hardware Acceleration Layer (HAL) module") set(the_description "The Hardware Acceleration Layer (HAL) module")
set(OPENCV_MODULE_TYPE STATIC) set(OPENCV_MODULE_TYPE STATIC)
# set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
if(UNIX) if(UNIX)
if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC) if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)

6
modules/world/CMakeLists.txt
View File

@ -35,8 +35,10 @@ set(headers_list "HEADERS")
set(sources_list "SOURCES") set(sources_list "SOURCES")
set(link_deps "") set(link_deps "")
foreach(m ${OPENCV_MODULE_${the_module}_DEPS}) foreach(m ${OPENCV_MODULE_${the_module}_DEPS})
set(headers_list "${headers_list};${OPENCV_MODULE_${m}_HEADERS}") if(OPENCV_MODULE_${m}_IS_PART_OF_WORLD)
set(sources_list "${sources_list};${OPENCV_MODULE_${m}_SOURCES}") set(headers_list "${headers_list};${OPENCV_MODULE_${m}_HEADERS}")
set(sources_list "${sources_list};${OPENCV_MODULE_${m}_SOURCES}")
endif()
set(link_deps "${link_deps};${OPENCV_MODULE_${m}_LINK_DEPS}") set(link_deps "${link_deps};${OPENCV_MODULE_${m}_LINK_DEPS}")
endforeach() endforeach()