From 188f33c7369441a115efc8297ae80fee8c17fb6f Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Tue, 20 Nov 2018 23:05:49 +0100 Subject: [PATCH] Use protobuf conan package --- CMakeLists.txt | 3 +++ conanfile.txt | 8 ++++++++ source/DataModel.cpp | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 conanfile.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 908eff4..d819e35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,4 +2,7 @@ cmake_minimum_required(VERSION 3.5) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup() + add_subdirectory(source) diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..322722b --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,8 @@ +[requires] +protobuf/3.6.1@bincrafters/stable + +[generators] +cmake + +[options] +protobuf:shared=True diff --git a/source/DataModel.cpp b/source/DataModel.cpp index d7be767..216eb8c 100644 --- a/source/DataModel.cpp +++ b/source/DataModel.cpp @@ -33,7 +33,7 @@ void DataModel::write(std::ostream &outStream) const m_metaData.write(*dataModel.mutable_metadata()); m_v2Svk.write(*dataModel.mutable_v2svk()); - u_verbEnd.write(*dataModel.mutable_verbend()); + m_verbEnd.write(*dataModel.mutable_verbend()); m_genus.write(*dataModel.mutable_genus()); m_akkusativ.write(*dataModel.mutable_akkusativ()); m_dativ.write(*dataModel.mutable_dativ());