From 9fbfb0d0b30e4841c79e1ccfb3ec2be7a20dcad8 Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Thu, 12 Feb 2026 00:36:20 +0300 Subject: [PATCH] ... --- CMakeLists.txt | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d44adc0..e9abd60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,8 @@ if(USE_SPDLOG) set(SPDLOG_USE_STD_FORMAT ON CACHE INTERNAL "Use of C++20 std::format") set(SPDLOG_FMT_EXTERNAL OFF CACHE INTERNAL "Turn off external fmt library") + set(USE_SPDLOG_SYSTEM OFF) + find_package(spdlog CONFIG) if(NOT ${spdlog_FOUND}) message(STATUS "\tfetch spdlog-lib ...") @@ -62,7 +64,10 @@ if(USE_SPDLOG) "-DSPDLOG_USE_STD_FORMAT=ON -DSPDLOG_FMT_EXTERNAL=OFF" OVERRIDE_FIND_PACKAGE ) + find_package(spdlog REQUIRED CONFIG) + + set(USE_SPDLOG_SYSTEM ON) endif() endif() @@ -152,6 +157,8 @@ endif() if(USE_ASIO) pkg_check_modules(ASIOLIB IMPORTED_TARGET GLOBAL asio) + set(USE_ASIO_SYSTEM ON) + if(NOT ASIOLIB_FOUND) message(STATUS "\tfetch asio-lib ...") @@ -165,22 +172,25 @@ if(USE_ASIO) ) FetchContent_MakeAvailable(asiolib_project) + + execute_process( + WORKING_DIRECTORY ${asiolib_project_SOURCE_DIR}/asio + COMMAND ./autogen.sh + ) + + execute_process( + WORKING_DIRECTORY ${asiolib_project_SOURCE_DIR}/asio + COMMAND ./configure --prefix=${asiolib_project_SOURCE_DIR}/asio + ) + + set(ENV{PKG_CONFIG_PATH} "${asiolib_project_SOURCE_DIR}/asio") + pkg_check_modules(ASIOLIB IMPORTED_TARGET GLOBAL asio) + + message(STATUS "ASIO INC PATHS: ${ASIOLIB_INCLUDE_DIRS}") + + set(USE_ASIO_SYSTEM OFF) + endif() - - execute_process( - WORKING_DIRECTORY ${asiolib_project_SOURCE_DIR}/asio - COMMAND ./autogen.sh - ) - - execute_process( - WORKING_DIRECTORY ${asiolib_project_SOURCE_DIR}/asio - COMMAND ./configure --prefix=${asiolib_project_SOURCE_DIR}/asio - ) - - set(ENV{PKG_CONFIG_PATH} "${asiolib_project_SOURCE_DIR}/asio") - pkg_check_modules(ASIOLIB IMPORTED_TARGET GLOBAL asio) - - message(STATUS "ASIO INC PATHS: ${ASIOLIB_INCLUDE_DIRS}") endif() if(USE_BSPLINE_PCM) @@ -254,7 +264,7 @@ if(USE_ASIO) endif() if(USE_SPDLOG) - target_link_libraries(${PROJECT_NAME} INTERFACE spdlog::spdlog) + target_link_libraries(${PROJECT_NAME} INTERFACE spdlog::spdlog_header_only) endif() if(BUILD_TESTS)