From b8cd42e23562aa221ba701f38a82ff59adfc3829 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 24 Oct 2024 19:06:05 -0500 Subject: [PATCH] updated build system --- cmake/versions.cmake | 12 ++++++------ support/include/utils/config.hpp | 9 ++++----- support/test/include/test.hpp | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index aefb4bcb..fb10e730 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,15 +1,15 @@ set(BINUTILS_VERSION 2.41) -set(BOOST_MAJOR_VERSION 1) -set(BOOST_MINOR_VERSION 85) -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 85) +set(BOOST_PATCH_VERSION 0) set(CPP_HTTPLIB_VERSION 0.16.3) -set(CURL_VERSION 8.9.1) set(CURL2_VERSION 8_9_1) -set(EXPAT_VERSION 2.6.2) +set(CURL_VERSION 8.9.1) set(EXPAT2_VERSION 2_6_2) +set(EXPAT_VERSION 2.6.2) set(GCC_VERSION 14.2.0) set(GTEST_VERSION 1.15.2) set(ICU_VERSION 75-1) @@ -21,7 +21,7 @@ set(OPENSSL_VERSION 3.3.1) set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.14) set(SPDLOG_VERSION 1.14.1) -set(SQLITE_VERSION 3460100) set(SQLITE2_VERSION 3.46.1) +set(SQLITE_VERSION 3460100) set(STDUUID_VERSION 1.2.3) set(ZLIB_VERSION 1.3.1) diff --git a/support/include/utils/config.hpp b/support/include/utils/config.hpp index d246bfb1..9c65bcdf 100644 --- a/support/include/utils/config.hpp +++ b/support/include/utils/config.hpp @@ -59,7 +59,7 @@ #if !defined(__cplusplus) #include #endif // !defined(__cplusplus) -#else // !defined(_WIN32) +#else // !defined(_WIN32) #include #include #include @@ -116,7 +116,6 @@ #include #include #include -#include #include #include #include @@ -475,9 +474,9 @@ using http_ranges = std::vector; } // namespace repertory #endif // defined(__cplusplus) -#define REPERTORY_USES_FUNCTION_NAME() \ - static constexpr const std::string_view function_name{ \ - static_cast(__FUNCTION__), \ +#define REPERTORY_USES_FUNCTION_NAME() \ + static constexpr const std::string_view function_name { \ + static_cast(__FUNCTION__), \ } #endif // REPERTORY_INCLUDE_UTILS_CONFIG_HPP_ diff --git a/support/test/include/test.hpp b/support/test/include/test.hpp index 7aea9c00..52693dc4 100644 --- a/support/test/include/test.hpp +++ b/support/test/include/test.hpp @@ -37,8 +37,8 @@ using namespace ::testing; #include "utils/all.hpp" namespace repertory::test { -[[nodiscard]] auto create_random_file(std::size_t size) - -> utils::file::i_file &; +[[nodiscard]] auto +create_random_file(std::size_t size) -> utils::file::i_file &; [[nodiscard]] auto generate_test_file_name(std::string_view file_name_no_extension) -> std::string;