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
parent bf8434770f 8184e57dd6
commit 7bfd070864
4 changed files with 10 additions and 11 deletions
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()
# 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
if((NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD
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
)
set(OPENCV_MODULE_${the_module}_IS_PART_OF_WORLD ON CACHE INTERNAL "")