[opencv] 193/251: cmake: don't include protobuf on disabled DNN module

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit cbced23de45a691fbfa440c89091895e8504c79c
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Mon Jul 31 14:18:59 2017 +0300

    cmake: don't include protobuf on disabled DNN module
---
 modules/dnn/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
index 8b335ad..2a71568 100644
--- a/modules/dnn/CMakeLists.txt
+++ b/modules/dnn/CMakeLists.txt
@@ -2,6 +2,10 @@ if(WINRT)
   ocv_module_disable(dnn)
 endif()
 
+if(DEFINED BUILD_opencv_dnn AND NOT BUILD_opencv_dnn)
+  return()
+endif()
+
 include(${OpenCV_SOURCE_DIR}/cmake/OpenCVFindLibProtobuf.cmake)
 if(NOT Protobuf_FOUND)
   ocv_module_disable(opencv_dnn)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git