wip

Project-OSRM · May 25, 2024 · b553c63 · b553c63
1 parent 206cb53
commit b553c63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -7,8 +7,8 @@
 #include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
-#include <variant>
 #include <utility>
+#include <variant>
 
 namespace osrm::extractor
 {

diff --git 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