From 42cbca0ff06f16110fc88935fa75bf148e7808f1 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 28 May 2024 21:23:51 +0200 Subject: [PATCH] Move Sol2 to canonical path (#6912) --- CMakeLists.txt | 2 +- scripts/update_dependencies.sh | 2 +- third_party/{sol2-3.3.0 => sol2}/include/sol/config.hpp | 0 third_party/{sol2-3.3.0 => sol2}/include/sol/forward.hpp | 0 third_party/{sol2-3.3.0 => sol2}/include/sol/sol.hpp | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename third_party/{sol2-3.3.0 => sol2}/include/sol/config.hpp (100%) rename third_party/{sol2-3.3.0 => sol2}/include/sol/forward.hpp (100%) rename third_party/{sol2-3.3.0 => sol2}/include/sol/sol.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aff11255e8..1686da4934b 100644 --- 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 index f16b175ca0a..ce9e48af007 100755 --- 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/third_party/sol2-3.3.0/include/sol/config.hpp b/third_party/sol2/include/sol/config.hpp similarity index 100% rename from third_party/sol2-3.3.0/include/sol/config.hpp rename to third_party/sol2/include/sol/config.hpp diff --git a/third_party/sol2-3.3.0/include/sol/forward.hpp b/third_party/sol2/include/sol/forward.hpp similarity index 100% rename from third_party/sol2-3.3.0/include/sol/forward.hpp rename to third_party/sol2/include/sol/forward.hpp diff --git a/third_party/sol2-3.3.0/include/sol/sol.hpp b/third_party/sol2/include/sol/sol.hpp similarity index 100% rename from third_party/sol2-3.3.0/include/sol/sol.hpp rename to third_party/sol2/include/sol/sol.hpp