potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Do not build protobuf without dnn (#10689)

Browse Source 
* Do not build protobuf if dnn is disabled

* Added BUILD_LIST cmake option to the cache

* Moved protobuf to the top level

* Fixed static build

* Fixed world build

* fixup! Fixed world build
This commit is contained in:
Maksim Shabunin
2018-02-01 16:30:23 +03:00
committed by Vadim Pisarevsky
parent 36222c9eed
commit e56d6054aa
8 changed files with 113 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVModule.cmake
+8 -1
View File
@@ -653,7 +653,14 @@ macro(ocv_module_include_directories)
"${OPENCV_MODULE_${the_module}_LOCATION}/src"
"${CMAKE_CURRENT_BINARY_DIR}" # for precompiled headers
)
ocv_target_include_modules(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${ARGN})
foreach(arg ${ARGN})
if(IS_ABSOLUTE "${arg}")
list(APPEND incs "${arg}")
else()
list(APPEND incs "${OPENCV_MODULE_${the_module}_LOCATION}/${arg}")
endif()
endforeach()
ocv_target_include_modules(${the_module} ${OPENCV_MODULE_${the_module}_DEPS} ${incs})
endmacro()