Skip to content

Support for external fmt #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MohammadAlTurany merged 1 commit into from
Aug 27, 2019
Merged

Support for external fmt #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}")
Expand Down
1 change: 1 addition & 0 deletions examples/common/mcstack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Set(INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${CMAKE_SOURCE_DIR}/examples/common/mcstack
${FairLogger_INCDIR}
)

Include_Directories(${INCLUDE_DIRECTORIES})
Expand Down