From 1e51d2a00752974ee65eafed69704875242a164c Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 9 Nov 2022 09:15:30 +0100 Subject: [PATCH] squeeze out version information of the used libs. --- CMakeLists.txt | 27 +++++++++++++++------------ cmake/FindFFTW3.cmake | 3 ++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86cd11de..c1454891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,9 @@ endif (${LONG_DOUBLE} GREATER ${DOUBLE}) #--- add path to my own find modules and other stuff set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +#--- check for pkg-config ----------------------------------------------------- +find_package(PkgConfig REQUIRED) + #--- check for git ------------------------------------------------------------ find_package(Git REQUIRED) @@ -239,14 +242,14 @@ message("") message(" Requirements:") message(" -------------") message("") -message(" FFTW3 found in ${FFTW3_INCLUDE}") -message(" GSL found in ${GSL_INCLUDE_DIRS}") -message(" BOOST found in ${Boost_INCLUDE_DIRS}") -message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}") -message(" ROOT found in ${ROOT_INCLUDE_DIRS}") +message(" FFTW3 found in ${FFTW3_INCLUDE}, Version: ${FFTW_VERSION}") +message(" GSL found in ${GSL_INCLUDE_DIRS}, Version: ${GSL_VERSION}") +message(" BOOST found in ${Boost_INCLUDE_DIRS}, Version: ${Boost_VERSION}") +message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}, Version: ${LIBXML2_VERSION_STRING}") +message(" ROOT found in ${ROOT_INCLUDE_DIRS}, Version: ${ROOT_VERSION}") if (OpenMP_FOUND) if (OpenMP_CXX_VERSION) - message(" OpenMP found (version ${OpenMP_CXX_VERSION})") + message(" OpenMP found Version: ${OpenMP_CXX_VERSION}") else (OpenMP_CXX_VERSION) message(" OpenMP found") endif (OpenMP_CXX_VERSION) @@ -255,23 +258,23 @@ endif (OpenMP_FOUND) if (nexus) message("") message(" HDF4 found in ${HDF4_INCLUDE_DIRS}") - message(" HDF5 found in ${HDF5_INCLUDE_DIRS}") - message(" NeXus found in ${NEXUS_INCLUDE_DIR}") + message(" HDF5 found in ${HDF5_INCLUDE_DIRS}, Version: ${HDF5_VERSION}") + message(" NeXus found in ${NEXUS_INCLUDE_DIR}, Version: ${NEXUS_VERSION_STRING}") endif (nexus) message("") if (qt_based_tools) if (Qt6Core_FOUND) - message(" Qt found in ${Qt6Core_INCLUDE_DIRS} (Version: ${Qt6Core_VERSION})") + message(" Qt found in ${Qt6Core_INCLUDE_DIRS}, Version: ${Qt6Core_VERSION}") else (Qt6Core_FOUND) if (Qt5Core_FOUND) - message(" Qt found in ${Qt5Core_INCLUDE_DIRS} (Version: ${Qt5Core_VERSION})") + message(" Qt found in ${Qt5Core_INCLUDE_DIRS}, Version: ${Qt5Core_VERSION}") else (Qt5Core_FOUND) if (Qt4_FOUND) - message(" Qt found (Version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})") + message(" Qt found Version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}") else (Qt4_FOUND) if (QT_FOUND) - message(" Qt found (Version: ${QT_VERSION})") + message(" Qt found Version: ${QT_VERSION}") endif (QT_FOUND) endif (Qt4_FOUND) endif (Qt5Core_FOUND) diff --git a/cmake/FindFFTW3.cmake b/cmake/FindFFTW3.cmake index f89cd3f6..ca02a48e 100644 --- a/cmake/FindFFTW3.cmake +++ b/cmake/FindFFTW3.cmake @@ -213,7 +213,8 @@ if (FFTW3Q_THREAD_FOUND) add_imported_library("FFTW3Q_THREAD" "${FFTW3Q_THREAD_LIBRARY}" "${FFTW3_INCLUDE}") endif() +pkg_check_modules(FFTW fftw3 QUIET) if (FFTW3_FOUND) - message("-- Found FFTW3: ${FFTW3_INCLUDE}") + message("-- Found FFTW3: ${FFTW3_INCLUDE}, Version: ${FFTW_VERSION}") endif (FFTW3_FOUND)