From 593b22a8a90eb66c0898ae06f097f32f4bf3dfd4 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 6 May 2024 11:23:03 +0200 Subject: [PATCH] build: automatically use system-installed libfmt --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2f993fb..d9fd3046 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ if(APPLE) endif() if(WIN32) option(USE_RICEPP_PACKAGE "use pre-built RICEPP package" OFF) - set(PREFER_SYSTEM_LIBFMT ON) set(PREFER_SYSTEM_ZSTD ON) set(PREFER_SYSTEM_XXHASH ON) else() @@ -52,7 +51,6 @@ else() option(ENABLE_UBSAN "enable undefined behaviour sanitizer" OFF) option(ENABLE_COVERAGE "enable code coverage" OFF) option(USE_JEMALLOC "build with jemalloc" ON) - option(PREFER_SYSTEM_LIBFMT "use system libfmt if available" OFF) option(PREFER_SYSTEM_ZSTD "use system zstd if available" OFF) option(PREFER_SYSTEM_XXHASH "use system xxHash if available" OFF) option(PREFER_SYSTEM_GTEST "use system gtest if available" OFF) @@ -210,9 +208,9 @@ if(WITH_MAN_PAGES) endforeach() endif() -if(PREFER_SYSTEM_LIBFMT) - find_package(fmt 10.0 CONFIG) -else() +find_package(fmt 10.0 CONFIG QUIET) + +if(NOT fmt_FOUND) include(FetchContent) FetchContent_Declare( fmt @@ -227,8 +225,6 @@ else() endif() endif() -find_package(Boost 1.67 REQUIRED COMPONENTS chrono iostreams program_options) - find_package(range-v3 0.12.0 CONFIG QUIET) if(NOT range-v3_FOUND) @@ -245,6 +241,8 @@ if(NOT range-v3_FOUND) endif() endif() +find_package(Boost 1.67 REQUIRED COMPONENTS chrono iostreams program_options) + if(STATIC_BUILD_DO_NOT_USE) set(CMAKE_FIND_LIBRARY_SUFFIXES .a) endif()