From e0db35d087a58c23990e4698581878b64499e7a1 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 27 Apr 2024 22:18:18 +0100 Subject: [PATCH] build: remove libfmt dependency --- CMakeLists.txt | 15 --------------- tools/CMakeLists.txt | 2 +- tools/CalypTools.cpp | 5 ++--- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7a10db..76f0620 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,21 +106,6 @@ INCLUDE(FetchContent) SET(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/deps") -FETCHCONTENT_DECLARE( - fmtformat - GIT_REPOSITORY https://github.com/fmtlib/fmt - GIT_TAG 9.1.0 -) - -SET_PACKAGE_PROPERTIES( - fmtformat PROPERTIES - URL "https://github.com/fmtlib/fmt" - DESCRIPTION "A modern formatting library" - TYPE REQUIRED -) -FETCHCONTENT_MAKEAVAILABLE(fmtformat) -FIND_PACKAGE(fmt) - # Doxygen IF(BUILD_DOC) FIND_PACKAGE(Doxygen) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index f4a5e34..5edd12d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -8,6 +8,6 @@ SET(Calyp_Tools_SRCS main.cpp CalypTools.cpp CalypToolsCmdParser.cpp) ADD_EXECUTABLE(${PROJECT_NAME}Tools ${Calyp_Tools_SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME}Tools ${PROJECT_LIBRARY} CalypModules fmt::fmt) +TARGET_LINK_LIBRARIES(${PROJECT_NAME}Tools ${PROJECT_LIBRARY} CalypModules) INSTALL(TARGETS ${PROJECT_NAME}Tools DESTINATION bin) diff --git a/tools/CalypTools.cpp b/tools/CalypTools.cpp index 2fdb8cd..288c4ee 100644 --- a/tools/CalypTools.cpp +++ b/tools/CalypTools.cpp @@ -24,10 +24,9 @@ #include "CalypTools.h" -#include - #include #include +#include #include #include "config.h" @@ -722,7 +721,7 @@ int CalypTools::ListStatistics() log( CLP_LOG_RESULT, " Range: " ); for( unsigned channel = 0; channel < currFrame->getNumberChannels(); channel++ ) { - log( CLP_LOG_RESULT, fmt::format( "[{}:{}]", min[channel], max[channel] ) ); + log( CLP_LOG_RESULT, std::format( "[{}:{}]", min[channel], max[channel] ) ); } log( CLP_LOG_RESULT, "|\n" );