From b553c63a3b417a90bc8cbbdb81dacf358544af3b Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sat, 25 May 2024 19:11:40 +0200 Subject: [PATCH] wip --- CMakeLists.txt | 2 +- include/extractor/internal_extractor_edge.hpp | 2 +- scripts/update_dependencies.sh | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f8ee9dde18..23bd0bcad59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,7 +359,7 @@ if(ENABLE_CONAN) KEEP_RPATHS NO_OUTPUT_DIRS OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake - # onetbb:shared=${TBB_SHARED} + onetbb:shared=${TBB_SHARED} boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it BUILD missing ) diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp index 453e15d0d0a..c9e072d60da 100644 --- a/include/extractor/internal_extractor_edge.hpp +++ b/include/extractor/internal_extractor_edge.hpp @@ -7,8 +7,8 @@ #include "util/typedefs.hpp" #include -#include #include +#include namespace osrm::extractor { diff --git a/scripts/update_dependencies.sh b/scripts/update_dependencies.sh index fdeecbac77b..eb628c0dfed 100755 --- a/scripts/update_dependencies.sh +++ b/scripts/update_dependencies.sh @@ -12,9 +12,6 @@ set -o nounset OSMIUM_PATH="osmcode/libosmium" OSMIUM_TAG=v2.14.0 -VARIANT_PATH="mapbox/variant" -VARIANT_TAG=v1.2.0 - SOL_PATH="ThePhD/sol2" SOL_TAG=v2.17.5 @@ -56,6 +53,6 @@ function update_subtree () { } ## Update dependencies -for dep in osmium variant sol rapidjson microtar protozero vtzero fmt; do +for dep in osmium sol rapidjson microtar protozero vtzero fmt; do update_subtree $dep done