From 53ca91199e282b876fbd3436ba9b586bc578fd07 Mon Sep 17 00:00:00 2001
From: Leonardo Parente <23251360+leoparente@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:32:36 -0400
Subject: [PATCH] fix build by updating json validator version (#709)

---
 conanfile.txt      | 4 ++--
 src/CMakeLists.txt | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conanfile.txt b/conanfile.txt
index cb8d7c1f6..55d3b7d2b 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -4,9 +4,9 @@ corrade/2020.06
 cpp-httplib/0.14.3
 docopt.cpp/0.6.3
 fast-cpp-csv-parser/cci.20211104
-json-schema-validator/2.2.0
+json-schema-validator/2.3.0
 libmaxminddb/1.8.0
-nlohmann_json/3.11.2
+nlohmann_json/3.11.3
 openssl/1.1.1w
 opentelemetry-proto/1.0.0
 pcapplusplus/23.09
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d3d8de5e..fa58586d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,6 +4,10 @@ message(STATUS "visor-core")
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 
 #generate cpp code from opentelemetry-proto
+if(NOT CMAKE_CROSSCOMPILING)
+  # Workaround due to changes in protobuf conan receipt
+  set(PROTOC_PROGRAM ${CONAN_BIN_DIRS_PROTOBUF}/protoc)
+endif()
 find_package(Protobuf REQUIRED)
 set(OTELCPP_PROTO_PATH ${CONAN_OPENTELEMETRY-PROTO_ROOT}/res)
 set(BUILD_SHARED_LIBS FALSE)