Skip to content
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

cmake: move find_package from plugin_add to CMakeLists.txt #1678

Merged
merged 1 commit into from
Nov 24, 2024
Merged

cmake: move find_package from plugin_add to CMakeLists.txt #1678

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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ find_package(EDM4EIC 5.0 REQUIRED)
# spdlog
find_package(spdlog REQUIRED)

# fmt
find_package(fmt 9.0.0 REQUIRED)

# Guidelines Support Library
find_package(Microsoft.GSL CONFIG)

Expand Down
19 changes: 0 additions & 19 deletions cmake/jana_plugin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,6 @@ macro(plugin_add _name)
endif()
endforeach()

# Include JANA by default
find_package(JANA REQUIRED)

# TODO: NWB: This really needs to be a dependency of JANA itself. If we don't
# do this here, CMake will later refuse to accept that podio is indeed a
# dependency of JANA and aggressively reorders my target_link_list to reflect
# this misapprehension.
# https://gitlab.kitware.com/cmake/cmake/blob/v3.13.2/Source/cmComputeLinkDepends.cxx
find_package(podio REQUIRED)

# include logging by default
find_package(spdlog REQUIRED)

# include fmt by default
find_package(fmt 9.0.0 REQUIRED)

# include gsl by default
find_package(Microsoft.GSL CONFIG)

# Define plugin
if(${_name}_WITH_PLUGIN)
add_library(${_name}_plugin SHARED ${PLUGIN_SOURCES})
Expand Down
Loading