diff --git a/cmake/versions.cmake b/cmake/versions.cmake index fb10e730..aefb4bcb 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,15 +1,15 @@ set(BINUTILS_VERSION 2.41) -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(BOOST2_MAJOR_VERSION 1) +set(BOOST2_MINOR_VERSION 76) +set(BOOST2_PATCH_VERSION 0) set(CPP_HTTPLIB_VERSION 0.16.3) -set(CURL2_VERSION 8_9_1) set(CURL_VERSION 8.9.1) -set(EXPAT2_VERSION 2_6_2) +set(CURL2_VERSION 8_9_1) set(EXPAT_VERSION 2.6.2) +set(EXPAT2_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(SQLITE2_VERSION 3.46.1) set(SQLITE_VERSION 3460100) +set(SQLITE2_VERSION 3.46.1) set(STDUUID_VERSION 1.2.3) set(ZLIB_VERSION 1.3.1) diff --git a/support/src/utils/path.cpp b/support/src/utils/path.cpp index 20453851..5eb6c33f 100644 --- a/support/src/utils/path.cpp +++ b/support/src/utils/path.cpp @@ -72,7 +72,7 @@ auto absolute(std::string_view path) -> std::string { return abs_path; } - abs_path = finalize(resolve(abs_path)); + abs_path = resolve(finalize(abs_path)); #if defined(_WIN32) if (not utils::string::contains(abs_path, dot)) { return abs_path; diff --git a/support/test/src/utils/path_test.cpp b/support/test/src/utils/path_test.cpp index fff28838..4cfe3162 100644 --- a/support/test/src/utils/path_test.cpp +++ b/support/test/src/utils/path_test.cpp @@ -392,7 +392,10 @@ TEST(utils_path, absolute) { #endif // defined(_WIN32) auto home = utils::path::absolute(home_env); - path = utils::path::absolute("~"); + path = utils::path::absolute("~/"); + EXPECT_STREQ(home.c_str(), path.c_str()); + + path = utils::path::absolute("~\\"); EXPECT_STREQ(home.c_str(), path.c_str()); } @@ -411,14 +414,14 @@ TEST(utils_path, absolute_can_resolve_path_variables) { auto expanded_str = utils::path::absolute("%USERPROFILE%"); EXPECT_STREQ(home.c_str(), expanded_str.c_str()); - expanded_str = utils::path::absolute("~"); + expanded_str = utils::path::absolute("~\\"); EXPECT_STREQ(home.c_str(), expanded_str.c_str()); EXPECT_STREQ((home + home).c_str(), expanded_str.c_str()); #else // !defined(_WIN32) home = std::getenv("HOME"); home = utils::path::absolute(home); - auto expanded_str = utils::path::absolute("~"); + auto expanded_str = utils::path::absolute("~/"); EXPECT_STREQ(home.c_str(), expanded_str.c_str()); #endif // defined(_WIN32) }