From 7e3eb2bc1652b1fbaca6eabc5dbf2754fe3cbd94 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 25 Apr 2025 23:28:26 -0500 Subject: [PATCH] updated build system --- cmake/versions.cmake | 12 ++--- support/include/utils/file.hpp | 98 ++++++++++++++++------------------ 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 17d5eb4c..c45c2174 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,15 +1,15 @@ set(BINUTILS_VERSION 2.44) -set(BOOST_MAJOR_VERSION 1) -set(BOOST_MINOR_VERSION 88) -set(BOOST_PATCH_VERSION 0) set(BOOST2_MAJOR_VERSION 1) set(BOOST2_MINOR_VERSION 76) set(BOOST2_PATCH_VERSION 0) +set(BOOST_MAJOR_VERSION 1) +set(BOOST_MINOR_VERSION 88) +set(BOOST_PATCH_VERSION 0) set(CPP_HTTPLIB_VERSION 0.20.0) -set(CURL_VERSION 8.13.0) set(CURL2_VERSION 8_13_0) -set(EXPAT_VERSION 2.7.1) +set(CURL_VERSION 8.13.0) set(EXPAT2_VERSION 2_7_1) +set(EXPAT_VERSION 2.7.1) set(GCC_VERSION 14.2.0) set(GTEST_VERSION 1.16.0) set(ICU_VERSION 76-1) @@ -21,7 +21,7 @@ set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.15) set(ROCKSDB_VERSION 10.0.1) set(SPDLOG_VERSION 1.15.2) -set(SQLITE_VERSION 3490100) set(SQLITE2_VERSION 3.49.1) +set(SQLITE_VERSION 3490100) set(STDUUID_VERSION 1.2.3) set(ZLIB_VERSION 1.3.1) diff --git a/support/include/utils/file.hpp b/support/include/utils/file.hpp index 104593d0..d0993ef3 100644 --- a/support/include/utils/file.hpp +++ b/support/include/utils/file.hpp @@ -41,13 +41,13 @@ namespace repertory::utils::file { [[nodiscard]] auto create_temp_name(std::string_view file_part) -> std::string; // INFO: has test -[[nodiscard]] auto create_temp_name(std::wstring_view file_part) - -> std::wstring; +[[nodiscard]] auto +create_temp_name(std::wstring_view file_part) -> std::wstring; // INFO: has test [[nodiscard]] inline auto -directory_exists_in_path(std::string_view path, std::string_view sub_directory) - -> bool; +directory_exists_in_path(std::string_view path, + std::string_view sub_directory) -> bool; // INFO: has test [[nodiscard]] inline auto @@ -55,46 +55,45 @@ directory_exists_in_path(std::wstring_view path, std::wstring_view sub_directory) -> bool; // INFO: has test -[[nodiscard]] inline auto file_exists_in_path(std::string_view path, - std::string_view file_name) - -> bool; +[[nodiscard]] inline auto +file_exists_in_path(std::string_view path, std::string_view file_name) -> bool; // INFO: has test -[[nodiscard]] inline auto file_exists_in_path(std::wstring_view path, - std::wstring_view file_name) - -> bool; +[[nodiscard]] inline auto +file_exists_in_path(std::wstring_view path, + std::wstring_view file_name) -> bool; // INFO: has test -[[nodiscard]] auto get_free_drive_space(std::string_view path) - -> std::optional; +[[nodiscard]] auto +get_free_drive_space(std::string_view path) -> std::optional; // INFO: has test -[[nodiscard]] auto get_free_drive_space(std::wstring_view path) - -> std::optional; +[[nodiscard]] auto +get_free_drive_space(std::wstring_view path) -> std::optional; // INFO: has test -[[nodiscard]] auto get_time(std::string_view path, time_type type) - -> std::optional; +[[nodiscard]] auto get_time(std::string_view path, + time_type type) -> std::optional; // INFO: has test -[[nodiscard]] auto get_time(std::wstring_view path, time_type type) - -> std::optional; +[[nodiscard]] auto get_time(std::wstring_view path, + time_type type) -> std::optional; // INFO: has test -[[nodiscard]] auto get_times(std::string_view path) - -> std::optional; +[[nodiscard]] auto +get_times(std::string_view path) -> std::optional; // INFO: has test -[[nodiscard]] auto get_times(std::wstring_view path) - -> std::optional; +[[nodiscard]] auto +get_times(std::wstring_view path) -> std::optional; // INFO: has test -[[nodiscard]] auto get_total_drive_space(std::string_view path) - -> std::optional; +[[nodiscard]] auto +get_total_drive_space(std::string_view path) -> std::optional; // INFO: has test -[[nodiscard]] auto get_total_drive_space(std::wstring_view path) - -> std::optional; +[[nodiscard]] auto +get_total_drive_space(std::wstring_view path) -> std::optional; #if defined(PROJECT_ENABLE_LIBDSM) [[nodiscard]] auto @@ -102,20 +101,20 @@ smb_create_and_validate_relative_path(std::string_view smb_path, std::string_view rel_path) -> std::string; // INFO: has test -[[nodiscard]] auto smb_create_relative_path(std::string_view smb_path) - -> std::string; +[[nodiscard]] auto +smb_create_relative_path(std::string_view smb_path) -> std::string; // INFO: has test -[[nodiscard]] auto smb_create_search_path(std::string_view smb_path) - -> std::string; +[[nodiscard]] auto +smb_create_search_path(std::string_view smb_path) -> std::string; // INFO: has test -[[nodiscard]] auto smb_create_smb_path(std::string_view smb_path, - std::string_view rel_path) - -> std::string; +[[nodiscard]] auto +smb_create_smb_path(std::string_view smb_path, + std::string_view rel_path) -> std::string; -[[nodiscard]] auto smb_get_parent_path(std::string_view smb_path) - -> std::string; +[[nodiscard]] auto +smb_get_parent_path(std::string_view smb_path) -> std::string; [[nodiscard]] auto smb_get_root_path(std::string_view smb_path) -> std::string; @@ -144,30 +143,27 @@ read_json_file(std::string_view path, nlohmann::json &data, std::optional password = std::nullopt) -> bool; // INFO: has test -[[nodiscard]] auto -read_json_file(std::wstring_view path, nlohmann::json &data, - std::optional password = std::nullopt) - -> bool; +[[nodiscard]] auto read_json_file( + std::wstring_view path, nlohmann::json &data, + std::optional password = std::nullopt) -> bool; // INFO: has test -[[nodiscard]] auto -write_json_file(std::string_view path, const nlohmann::json &data, - std::optional password = std::nullopt) - -> bool; +[[nodiscard]] auto write_json_file( + std::string_view path, const nlohmann::json &data, + std::optional password = std::nullopt) -> bool; // INFO: has test -[[nodiscard]] auto -write_json_file(std::wstring_view path, const nlohmann::json &data, - std::optional password = std::nullopt) - -> bool; +[[nodiscard]] auto write_json_file( + std::wstring_view path, const nlohmann::json &data, + std::optional password = std::nullopt) -> bool; #else // !defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) // INFO: has test -[[nodiscard]] auto read_json_file(std::string_view path, nlohmann::json &data) - -> bool; +[[nodiscard]] auto read_json_file(std::string_view path, + nlohmann::json &data) -> bool; // INFO: has test -[[nodiscard]] auto read_json_file(std::wstring_view path, nlohmann::json &data) - -> bool; +[[nodiscard]] auto read_json_file(std::wstring_view path, + nlohmann::json &data) -> bool; // INFO: has test [[nodiscard]] auto write_json_file(std::string_view path,