Merge pull request #711 from orb-community/develop

Release 4.5.0
orb-community · Jan 5, 2024 · 1f65d63 · 1f65d63
2 parents 8e7c8b6 + 53ca911
commit 1f65d63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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)