Commit 1e6f49f2 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/342-update-nlohmann_json-due-to-cmake-issue' into 'master' 

Resolve "Update dependencies due to cmake issue"

Closes #342

Closes #342

See merge request !231
parents 6ddadb20 bb7bb76d

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -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))

CMake/load_nlohmann_json.cmake

+2 −2
Original line number Diff line number Diff line
@@ -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)

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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)

tests/integration/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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}")

tests/unit/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

)