diff --git a/CHANGELOG.md b/CHANGELOG.md index f58fa413b56616f379875fd798d9b58161b21107..5dc45d1fb8a29b2d03db2e7a9e4714bbd550bde8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - This solves an issue with the ci when looks at gcl-build directory (mainly lxstat) - Refactor and modernize sfind and gfind ([!226](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/226)) - Export extra user library functions ([!227](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/227)) - - Update CLI11 and fmt to avoid cmake errors ([!188])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/188)) + - Update CLI11 and fmt to avoid cmake errors ([!231])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/231)) ### Fixed - Dup3 is supported if O_CLOEXEC is not used (i.e. hexdump) ([!228](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/228)) diff --git a/CMake/load_nlohmann_json.cmake b/CMake/load_nlohmann_json.cmake index 951900998bad144acff05e0845504dd87d3f2a7d..34a5f4633e0d429e836d0ff6feb04233c0fd2b2e 100644 --- a/CMake/load_nlohmann_json.cmake +++ b/CMake/load_nlohmann_json.cmake @@ -32,7 +32,7 @@ set(FETCHCONTENT_QUIET OFF) FetchContent_Declare(nlohmann_json DOWNLOAD_EXTRACT_TIMESTAMP ON - URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz) + URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz) FetchContent_GetProperties(nlohmann_json) @@ -49,4 +49,4 @@ if (NOT nlohmann_json_POPULATED) set(JSON_Install OFF CACHE INTERNAL "") add_subdirectory(${nlohmann_json_SOURCE_DIR} ${nlohmann_json_BINARY_DIR}) -endif () \ No newline at end of file +endif () diff --git a/CMakeLists.txt b/CMakeLists.txt index 661bc82838c03299301cd3626b072fecbb9be564..4d31f4a354cbcc14f9e934859b8a7053d00fd9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,7 +229,7 @@ include_from_source(fmt MESSAGE "[${PROJECT_NAME}] Searching for {fmt}" SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/fmt GIT_REPOSITORY https://github.com/fmtlib/fmt - GIT_TAG e57ca2e3685b160617d3d95fcd9e789c4e06ca88 # v10.1.0 + GIT_TAG e69e5f977d458f2650bb346dadf2ad30c5320281 # v10.1.0 ) # ensure that fmt is linked as PIC @@ -248,7 +248,7 @@ include_from_source(cli11 MESSAGE "[${PROJECT_NAME}] Searching for CLI11" SOURCE_DIR ${GKFS_DEPENDENCIES_PATH}/CLI11 GIT_REPOSITORY https://github.com/CLIUtils/CLI11 - GIT_TAG v2.2.0 + GIT_TAG v2.4.2 ) if (GKFS_ENABLE_CLIENT_METRICS) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 1bb3bdf8155a38b304a5ff51b9e93d8abcc8043e..e7d7cccc141717f9a07031e338eeeffd4b53c81f 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -51,7 +51,7 @@ if (NOT DBS) set(DBS "'gkfs_daemon_rocksdb'") endif () -FIND_PATH(BUILD_PATH CMakeLists.txt .) +FIND_PATH(BUILD_PATH conftest.template .) FILE(READ ${BUILD_PATH}/conftest.template CONF_TEST_FILE) STRING(REGEX REPLACE "'gkfs_daemon_rocksdb'" "${DBS}" MOD_CONF_TEST_FILE "${CONF_TEST_FILE}") FILE(WRITE ${BUILD_PATH}/conftest.py "${MOD_CONF_TEST_FILE}") diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 28734cced780ec3078050efbce98082a3223bf29..72e2d63d23a0686380237498eac9716faa457590 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -32,7 +32,7 @@ include(FetchContent) set(FETCHCONTENT_QUIET OFF) FetchContent_Declare(catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG 216713a4066b79d9803d374f261ccb30c0fb451f # v2.13.8 + GIT_TAG v2.13.9 GIT_SHALLOW ON GIT_PROGRESS ON )