diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/Dockerfile | 2 | ||||
| -rw-r--r-- | client/settings.hpp | 4 | ||||
| -rw-r--r-- | server/Dockerfile | 2 | ||||
| -rw-r--r-- | server/main/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | server/main/settings.hpp | 4 |
7 files changed, 9 insertions, 11 deletions
@@ -12,7 +12,7 @@ TOOLSET ?= auto PLATFORM ?= auto CONFIGURATION ?= Debug BOOST_VERSION ?= 1.81.0 -BOOST_LIBRARIES := filesystem program_options regex test +BOOST_LIBRARIES := program_options regex test CMAKE_FLAGS ?= --cmake-arg=-DMATH_SERVER_TESTS=ON INSTALL_PREFIX ?= $(install_dir) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 6dc9490..cf0c1ee 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS filesystem program_options) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS program_options) set(CMAKE_THREAD_PREFER_PTHREAD ON) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -9,7 +9,6 @@ set_target_properties(client PROPERTIES OUTPUT_NAME math-client) target_link_libraries(client PRIVATE Threads::Threads) target_link_libraries(client PRIVATE Boost::disable_autolinking - Boost::filesystem Boost::program_options) install(TARGETS client RUNTIME DESTINATION bin) if(MSVC) diff --git a/client/Dockerfile b/client/Dockerfile index d7b5418..02b21e7 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -24,7 +24,7 @@ LABEL maintainer="Egor Tensin <egor@tensin.name>" ARG src_dir COPY --from=builder ["$src_dir/build/install", "/opt/math-server"] -RUN runtime_deps='libboost-filesystem1.83.0 libboost-program-options1.83.0 libboost-regex1.83.0 libboost-test1.83.0' && \ +RUN runtime_deps='libboost-program-options1.83.0 libboost-regex1.83.0 libboost-test1.83.0' && \ apt update && \ DEBIAN_FRONTEND=noninteractive \ apt install -y --no-install-recommends $runtime_deps && \ diff --git a/client/settings.hpp b/client/settings.hpp index ea3f1d1..3c8d6aa 100644 --- a/client/settings.hpp +++ b/client/settings.hpp @@ -7,10 +7,10 @@ #include "transport.hpp" -#include <boost/filesystem.hpp> #include <boost/program_options.hpp> #include <exception> +#include <filesystem> #include <iostream> #include <string> #include <vector> @@ -100,7 +100,7 @@ public: private: static std::string extract_filename(const std::string& path) { - return boost::filesystem::path{path}.filename().string(); + return std::filesystem::path{path}.filename().string(); } const std::string m_prog_name; diff --git a/server/Dockerfile b/server/Dockerfile index dd3e428..e93c030 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -24,7 +24,7 @@ LABEL maintainer="Egor Tensin <egor@tensin.name>" ARG src_dir COPY --from=builder ["$src_dir/build/install", "/opt/math-server"] -RUN runtime_deps='libboost-filesystem1.83.0 libboost-program-options1.83.0 libboost-regex1.83.0 libboost-test1.83.0' && \ +RUN runtime_deps='libboost-program-options1.83.0 libboost-regex1.83.0 libboost-test1.83.0' && \ apt update && \ DEBIAN_FRONTEND=noninteractive \ apt install -y --no-install-recommends $runtime_deps && \ diff --git a/server/main/CMakeLists.txt b/server/main/CMakeLists.txt index 4eee9e5..c699185 100644 --- a/server/main/CMakeLists.txt +++ b/server/main/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS filesystem program_options) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS program_options) set(CMAKE_THREAD_PREFER_PTHREAD ON) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -15,7 +15,6 @@ target_link_libraries(server PRIVATE common parser) target_link_libraries(server PRIVATE Threads::Threads) target_link_libraries(server PRIVATE Boost::disable_autolinking - Boost::filesystem Boost::program_options) install(TARGETS server RUNTIME DESTINATION bin) if(MSVC) diff --git a/server/main/settings.hpp b/server/main/settings.hpp index afe2f01..b6c5b86 100644 --- a/server/main/settings.hpp +++ b/server/main/settings.hpp @@ -5,11 +5,11 @@ #pragma once -#include <boost/filesystem.hpp> #include <boost/program_options.hpp> #include <cstddef> #include <exception> +#include <filesystem> #include <iostream> #include <string> #include <thread> @@ -78,7 +78,7 @@ public: private: static std::string extract_filename(const std::string& path) { - return boost::filesystem::path{path}.filename().string(); + return std::filesystem::path{path}.filename().string(); } const std::string m_prog_name; |