From 5b9ccf6c1ad775352b6ae9e704c8f57d5546c4b7 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 27 Aug 2019 11:35:00 +0200 Subject: [PATCH] Support for external fmt --- CMakeLists.txt | 15 +++++++++++++++ examples/common/mcstack/CMakeLists.txt | 1 + 2 files changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 548f003009..38ff241c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,18 @@ endif() # FairRoot only supports ROOT6, so check which version is available find_package2(PUBLIC ROOT VERSION 6.10.00 REQUIRED) find_package2(PUBLIC FairLogger VERSION 1.2.0 REQUIRED) + +foreach(dep IN LISTS FairLogger_PACKAGE_DEPENDENCIES) +if(NOT dep STREQUAL "Boost") + find_package2(PUBLIC ${dep} REQUIRED VERSION ${FairLogger_${dep}_VERSION}) + set(PROJECT_${dep}_VERSION ${FairLogger_${dep}_VERSION}) + if(dep STREQUAL "fmt") # handling of external fmt installation + get_target_property(FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES) + set(FairLogger_INCDIR ${FairLogger_INCDIR} ${FMT_INCLUDE_DIR}) + endif() +endif() +endforeach() + find_package2(PUBLIC Pythia6) find_package2(PUBLIC Pythia8) find_package2(PUBLIC Protobuf) @@ -515,6 +527,9 @@ if(PROJECT_PACKAGE_DEPENDENCIES) get_filename_component(prefix ${IWYU_BINARY}/.. ABSOLUTE) elseif(${dep} STREQUAL yaml-cpp) get_filename_component(prefix ${YAML_CPP_INCLUDE_DIR}/.. ABSOLUTE) + elseif(${dep} STREQUAL fmt) + get_target_property(fmt_include fmt::fmt INTERFACE_INCLUDE_DIRECTORIES) + get_filename_component(prefix ${fmt_include}/.. ABSOLUTE) endif() message(STATUS " ${BWhite}${dep_padded}${CR}${version_padded}${prefix}") diff --git a/examples/common/mcstack/CMakeLists.txt b/examples/common/mcstack/CMakeLists.txt index 9d37984128..7f9e3cc5f5 100644 --- a/examples/common/mcstack/CMakeLists.txt +++ b/examples/common/mcstack/CMakeLists.txt @@ -12,6 +12,7 @@ Set(INCLUDE_DIRECTORIES ${BASE_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/examples/common/mcstack + ${FairLogger_INCDIR} ) Include_Directories(${INCLUDE_DIRECTORIES})