From 33fe52cd637ac2b68223a989d97798c38cafc41e Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 22 Sep 2025 07:47:42 +0200 Subject: [PATCH] Logger: Add information on FFTW being included --- CMakeLists.txt | 8 ++++++++ common/Logger.cpp | 4 +++- image_analysis/indexing/CMakeLists.txt | 5 ----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8738d73..c14577f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,14 @@ IF (CMAKE_CUDA_COMPILER) ENDIF() ENDIF() +FIND_LIBRARY(FFTWF_LIBRARY NAMES libfftw3f.a libfftw3f.so fftw3f DOC "FFTW single-precision library" + PATHS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu/) +CHECK_INCLUDE_FILE(fftw3.h HAS_FFTW3_H) + +IF(HAS_FFTW3_H AND FFTWF_LIBRARY) + ADD_COMPILE_DEFINITIONS(JFJOCH_USE_FFTW) +ENDIF() + INCLUDE_DIRECTORIES(include) INCLUDE(CheckIncludeFile) diff --git a/common/Logger.cpp b/common/Logger.cpp index ab5b081d..00d2f304 100644 --- a/common/Logger.cpp +++ b/common/Logger.cpp @@ -13,7 +13,9 @@ Logger::Logger(const std::string &service_name, const std::string &file_name) { #ifdef JFJOCH_USE_CUDA variant += "C"; #endif - +#ifdef JFJOCH_USE_FFTW + variant += "F"; +#endif std::vector sinks; sinks.push_back(std::make_shared()); diff --git a/image_analysis/indexing/CMakeLists.txt b/image_analysis/indexing/CMakeLists.txt index de6edc32..1dce547f 100644 --- a/image_analysis/indexing/CMakeLists.txt +++ b/image_analysis/indexing/CMakeLists.txt @@ -40,13 +40,8 @@ ELSE() TARGET_LINK_LIBRARIES(JFJochIndexing Eigen3::Eigen) ENDIF() -FIND_LIBRARY(FFTWF_LIBRARY NAMES libfftw3f.a libfftw3f.so fftw3f DOC "FFTW single-precision library" - PATHS /usr/lib /usr/lib64 /usr/lib/x86_64-linux-gnu/) -CHECK_INCLUDE_FILE(fftw3.h HAS_FFTW3_H) - IF(HAS_FFTW3_H AND FFTWF_LIBRARY) TARGET_SOURCES(JFJochIndexing PRIVATE FFTIndexerCPU.cpp FFTIndexerCPU.h) - TARGET_COMPILE_DEFINITIONS(JFJochIndexing PUBLIC JFJOCH_USE_FFTW) TARGET_LINK_LIBRARIES(JFJochIndexing ${FFTWF_LIBRARY}) MESSAGE(STATUS "FFT single-precision library found: ${FFTWF_LIBRARY}") ELSE()