Skip to content

fix build by updating json validator version #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2024
Merged

fix build by updating json validator version #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23068ba
fix build by updating json validator version
leoparente Jan 5, 2024
0d32798
remove not necessary code
leoparente Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down