This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch merge_2023-11-28 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 28cee7ece3fcadfc0117909c908180a6052fd35f Author: Marton Szasz <[email protected]> AuthorDate: Wed Nov 22 14:15:09 2023 +0100 MINIFICPP-2266 avoid using system versions of fmt and spdlog Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1697 --- cmake/Spdlog.cmake | 2 +- cmake/fmt.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Spdlog.cmake b/cmake/Spdlog.cmake index 578e0d812..07eb0f103 100644 --- a/cmake/Spdlog.cmake +++ b/cmake/Spdlog.cmake @@ -22,6 +22,6 @@ set(SPDLOG_FMT_EXTERNAL ON CACHE STRING "" FORCE) FetchContent_Declare(Spdlog URL https://github.com/gabime/spdlog/archive/refs/tags/v1.12.0.tar.gz URL_HASH SHA256=4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9 - FIND_PACKAGE_ARGS + OVERRIDE_FIND_PACKAGE ) FetchContent_MakeAvailable(Spdlog) diff --git a/cmake/fmt.cmake b/cmake/fmt.cmake index cbf2c66f8..fc48799ce 100644 --- a/cmake/fmt.cmake +++ b/cmake/fmt.cmake @@ -20,6 +20,6 @@ include(FetchContent) FetchContent_Declare(Fmt URL https://github.com/fmtlib/fmt/archive/refs/tags/10.1.0.tar.gz URL_HASH SHA256=deb0a3ad2f5126658f2eefac7bf56a042488292de3d7a313526d667f3240ca0a - FIND_PACKAGE_ARGS + OVERRIDE_FIND_PACKAGE ) FetchContent_MakeAvailable(Fmt)
