BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

updated build system

Browse Source
This commit is contained in:
Scott E. Graves 2024-10-10 08:30:53 -05:00
parent 9aafb62961
commit 9c01d51334
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/versions.cmake
View File

@ -1,15 +1,15 @@
set(BINUTILS_VERSION 2.41) 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_MAJOR_VERSION 1)
set(BOOST_MINOR_VERSION 85) set(BOOST_MINOR_VERSION 85)
set(BOOST_PATCH_VERSION 0) 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(CPP_HTTPLIB_VERSION 0.16.3)
set(CURL2_VERSION 8_9_1)
set(CURL_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(EXPAT_VERSION 2.6.2)
set(EXPAT2_VERSION 2_6_2)
set(GCC_VERSION 14.2.0) set(GCC_VERSION 14.2.0)
set(GTEST_VERSION 1.15.2) set(GTEST_VERSION 1.15.2)
set(ICU_VERSION 75-1) set(ICU_VERSION 75-1)
@ -21,7 +21,7 @@ set(OPENSSL_VERSION 3.3.1)
set(PKG_CONFIG_VERSION 0.29.2) set(PKG_CONFIG_VERSION 0.29.2)
set(PUGIXML_VERSION 1.14) set(PUGIXML_VERSION 1.14)
set(SPDLOG_VERSION 1.14.1) set(SPDLOG_VERSION 1.14.1)
set(SQLITE2_VERSION 3.46.1)
set(SQLITE_VERSION 3460100) set(SQLITE_VERSION 3460100)
set(SQLITE2_VERSION 3.46.1)
set(STDUUID_VERSION 1.2.3) set(STDUUID_VERSION 1.2.3)
set(ZLIB_VERSION 1.3.1) set(ZLIB_VERSION 1.3.1)

2
support/src/utils/path.cpp
View File

@ -72,7 +72,7 @@ auto absolute(std::string_view path) -> std::string {
return abs_path; return abs_path;
} }
abs_path = finalize(resolve(abs_path)); abs_path = resolve(finalize(abs_path));
#if defined(_WIN32) #if defined(_WIN32)
if (not utils::string::contains(abs_path, dot)) { if (not utils::string::contains(abs_path, dot)) {
return abs_path; return abs_path;

9
support/test/src/utils/path_test.cpp
View File

@ -392,7 +392,10 @@ TEST(utils_path, absolute) {
#endif // defined(_WIN32) #endif // defined(_WIN32)
auto home = utils::path::absolute(home_env); 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()); 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%"); auto expanded_str = utils::path::absolute("%USERPROFILE%");
EXPECT_STREQ(home.c_str(), expanded_str.c_str()); 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.c_str(), expanded_str.c_str());
EXPECT_STREQ((home + home).c_str(), expanded_str.c_str()); EXPECT_STREQ((home + home).c_str(), expanded_str.c_str());
#else // !defined(_WIN32) #else // !defined(_WIN32)
home = std::getenv("HOME"); home = std::getenv("HOME");
home = utils::path::absolute(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()); EXPECT_STREQ(home.c_str(), expanded_str.c_str());
#endif // defined(_WIN32) #endif // defined(_WIN32)
} }