From 677dc802ae4920a7bd45779eaa729ae008eb65f3 Mon Sep 17 00:00:00 2001 From: Alexander Enaldiev Date: Mon, 23 Apr 2018 15:15:34 +0300 Subject: [PATCH] protobuf build documenting: move the WITH_PROTOBUF option to the top level --- CMakeLists.txt | 1 + cmake/OpenCVFindProtobuf.cmake | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96d2ef8..6de2687 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,6 +279,7 @@ OCV_OPTION(WITH_GDAL "Include GDAL Support" OFF OCV_OPTION(WITH_GPHOTO2 "Include gPhoto2 library support" ON IF (UNIX AND NOT ANDROID AND NOT IOS) ) OCV_OPTION(WITH_LAPACK "Include Lapack library support" (NOT CV_DISABLE_OPTIMIZATION) IF (NOT ANDROID AND NOT IOS) ) OCV_OPTION(WITH_ITT "Include Intel ITT support" ON IF (NOT APPLE_FRAMEWORK) ) +OCV_OPTION(WITH_PROTOBUF "Enable libprotobuf" ON ) # OpenCV build components # =================================================== diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake index 16543fe..b9171f1 100644 --- a/cmake/OpenCVFindProtobuf.cmake +++ b/cmake/OpenCVFindProtobuf.cmake @@ -1,15 +1,14 @@ # If protobuf is found - libprotobuf target is available -ocv_option(WITH_PROTOBUF "Enable libprotobuf" ON) -ocv_option(BUILD_PROTOBUF "Force to build libprotobuf from sources" ON) -ocv_option(PROTOBUF_UPDATE_FILES "Force rebuilding .proto files (protoc should be available)" OFF) - set(HAVE_PROTOBUF FALSE) if(NOT WITH_PROTOBUF) return() endif() +ocv_option(BUILD_PROTOBUF "Force to build libprotobuf from sources" ON) +ocv_option(PROTOBUF_UPDATE_FILES "Force rebuilding .proto files (protoc should be available)" OFF) + function(get_protobuf_version version include) file(STRINGS "${include}/google/protobuf/stubs/common.h" ver REGEX "#define GOOGLE_PROTOBUF_VERSION [0-9]+") string(REGEX MATCHALL "[0-9]+" ver ${ver}) -- 2.7.4