Move Sol2 to canonical path (#6912)

Project-OSRM · May 28, 2024 · 42cbca0 · 42cbca0
1 parent c1ed731
commit 42cbca0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -120,7 +120,7 @@ endif()
 
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2-3.3.0/include)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2/include)
 
 set(BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework)
 

diff --git a/scripts/update_dependencies.sh b/scripts/update_dependencies.sh
@@ -13,7 +13,7 @@ OSMIUM_PATH="osmcode/libosmium"
 OSMIUM_TAG=v2.14.0
 
 SOL_PATH="ThePhD/sol2"
-SOL_TAG=v2.17.5
+SOL_TAG=v3.3.0
 
 RAPIDJSON_PATH="Tencent/rapidjson"
 RAPIDJSON_TAG=f9d53419e912910fd8fa57d5705fa41425428c35

diff --git a/...d_party/sol2-3.3.0/include/sol/config.hpp → third_party/sol2/include/sol/config.hpp b/...d_party/sol2-3.3.0/include/sol/config.hpp → third_party/sol2/include/sol/config.hpp
diff --git a/..._party/sol2-3.3.0/include/sol/forward.hpp → third_party/sol2/include/sol/forward.hpp b/..._party/sol2-3.3.0/include/sol/forward.hpp → third_party/sol2/include/sol/forward.hpp
diff --git a/third_party/sol2-3.3.0/include/sol/sol.hpp → third_party/sol2/include/sol/sol.hpp b/third_party/sol2-3.3.0/include/sol/sol.hpp → third_party/sol2/include/sol/sol.hpp