From 812d1a7ec32a6bbb98b90948cd996be32d9c9eb3 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 5 Jan 2024 14:23:38 +0100 Subject: [PATCH 1/2] Update some more dependencies --- third_party/cpptrace/CMakeLists.txt | 2 +- third_party/curl/CMakeLists.txt | 2 +- third_party/jsoncpp/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/cpptrace/CMakeLists.txt b/third_party/cpptrace/CMakeLists.txt index 63b63ca8a3..af5df85643 100644 --- a/third_party/cpptrace/CMakeLists.txt +++ b/third_party/cpptrace/CMakeLists.txt @@ -20,7 +20,7 @@ endforeach() ExternalProject_add( cpptrace GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git - GIT_TAG 4b11b87e4d905d003d0325a53994441cc767017a + GIT_TAG v0.3.1 PREFIX cpptrace CMAKE_ARGS "${CMAKE_ARGS}" ) diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt index b389866693..06365c2110 100644 --- a/third_party/curl/CMakeLists.txt +++ b/third_party/curl/CMakeLists.txt @@ -46,7 +46,7 @@ endforeach() ExternalProject_add( curl GIT_REPOSITORY https://github.com/curl/curl.git - GIT_TAG curl-7_84_0 + GIT_TAG curl-7_88_1 GIT_SHALLOW ON PREFIX curl CMAKE_ARGS "${CMAKE_ARGS}" diff --git a/third_party/jsoncpp/CMakeLists.txt b/third_party/jsoncpp/CMakeLists.txt index 9f4b5ce401..b79a552d48 100644 --- a/third_party/jsoncpp/CMakeLists.txt +++ b/third_party/jsoncpp/CMakeLists.txt @@ -30,7 +30,7 @@ endforeach() ExternalProject_Add( jsoncpp GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp - GIT_TAG 42e892d96e47b1f6e29844cc705e148ec4856448 + GIT_TAG 69098a18b9af0c47549d9a271c054d13ca92b006 PREFIX jsoncpp CMAKE_ARGS "${CMAKE_ARGS}" ) From 2f4bc3881cb993001162037079ba10ee9b8005fd Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 5 Jan 2024 15:10:41 +0100 Subject: [PATCH 2/2] Fix tracecpp breaking change --- src/system_tests/system_tests_runner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system_tests/system_tests_runner.cpp b/src/system_tests/system_tests_runner.cpp index 2e770f80ae..6204a11348 100644 --- a/src/system_tests/system_tests_runner.cpp +++ b/src/system_tests/system_tests_runner.cpp @@ -10,7 +10,7 @@ void handler(int sig) { mavsdk::LogErr() << "Got signal: " << strsignal(sig) << " (" << sig << ")"; - cpptrace::print_trace(); + cpptrace::generate_trace().print(); exit(1); } #endif