File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ corrade/2020.06
44cpp-httplib/0.14.3
55docopt.cpp/0.6.3
66fast-cpp-csv-parser/cci.20211104
7- json-schema-validator/2.2 .0
7+ json-schema-validator/2.3 .0
88libmaxminddb/1.8.0
9- nlohmann_json/3.11.2
9+ nlohmann_json/3.11.3
1010openssl/1.1.1w
1111opentelemetry-proto/1.0.0
1212pcapplusplus/23.09
Original file line number Diff line number Diff line change @@ -4,6 +4,10 @@ message(STATUS "visor-core")
44set_directory_properties (PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON )
55
66#generate cpp code from opentelemetry-proto
7+ if (NOT CMAKE_CROSSCOMPILING )
8+ # Workaround due to changes in protobuf conan receipt
9+ set (PROTOC_PROGRAM ${CONAN_BIN_DIRS_PROTOBUF} /protoc)
10+ endif ()
711find_package (Protobuf REQUIRED)
812set (OTELCPP_PROTO_PATH ${CONAN_OPENTELEMETRY-PROTO_ROOT}/res)
913set (BUILD_SHARED_LIBS FALSE )
You can’t perform that action at this time.
0 commit comments