Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: acts-project/acts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 00e0ff02e4443ec23c4ddc863b29d4c0bb2a6030
Choose a base ref
..
head repository: acts-project/acts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 55c7c226677841edfe974eac6a20b684ed764f40
Choose a head ref
Showing with 13 additions and 20 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −4 Plugins/FastJet/CMakeLists.txt
  3. +0 −1 Tests/UnitTests/Plugins/FastJet/CMakeLists.txt
  4. +10 −14 cmake/FindFastJet.cmake
  5. +1 −0 docs/getting_started.md
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -371,7 +371,7 @@ if(ACTS_BUILD_PLUGIN_JSON)
endif()
endif()
if(ACTS_BUILD_PLUGIN_FASTJET)
find_package(FastJet REQUIRED)
find_package(FastJet REQUIRED)
endif()
if(ACTS_BUILD_PLUGIN_GEOMODEL)
find_package(GeoModelCore ${_acts_geomodel_version} REQUIRED CONFIG)
5 changes: 1 addition & 4 deletions Plugins/FastJet/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -6,10 +6,7 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_link_libraries(
ActsPluginFastJet
INTERFACE FastJet
)
target_link_libraries(ActsPluginFastJet INTERFACE FastJet)

install(
TARGETS ActsPluginFastJet
1 change: 0 additions & 1 deletion Tests/UnitTests/Plugins/FastJet/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
set(unittest_extra_libraries ActsPluginFastJet)
add_unittest(TrackJetsTests TrackJetsTests.cpp)

24 changes: 10 additions & 14 deletions cmake/FindFastJet.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
# Find the FastJet includes and libraries.

find_library(
FastJet_LIBRARY
NAMES FastJet fastjet
DOC "The FastJet library"
)
find_library(FastJet_LIBRARY NAMES FastJet fastjet DOC "The FastJet library")

find_path(
FastJet_INCLUDE_DIR
fastjet/version.hh
DOC "The FastJet include directory"
FastJet_INCLUDE_DIR
fastjet/version.hh
DOC "The FastJet include directory"
)

file(READ "${FastJet_INCLUDE_DIR}/fastjet/config_auto.h" FastJet_VERSION_FILE)
string(
REGEX MATCH
"#define FASTJET_PACKAGE_VERSION \"([0-9]+\.[0-9]+\.[0-9]+)\""
_
${FastJet_VERSION_FILE}
REGEX MATCH
"#define FASTJET_PACKAGE_VERSION \"([0-9]+\.[0-9]+\.[0-9]+)\""
_
${FastJet_VERSION_FILE}
)

set(FastJet_VERSION ${CMAKE_MATCH_1})
@@ -38,7 +34,7 @@ set_property(
mark_as_advanced(FastJet_FOUND FastJet_INCLUDE_DIR FastJet_LIBRARY)

if(FastJet_FOUND)
message(STATUS "Found FastJet ${FastJet_VERSION} at ${FastJet_LIBRARY}")
message(STATUS "Found FastJet ${FastJet_VERSION} at ${FastJet_LIBRARY}")
else()
message(FATAL_ERROR "FastJet not found")
message(FATAL_ERROR "FastJet not found")
endif()
1 change: 1 addition & 0 deletions docs/getting_started.md
View file
Original file line number Diff line number Diff line change
@@ -279,6 +279,7 @@ components.
| ACTS_BUILD_PLUGIN_PODIO | Build Podio plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_EDM4HEP | Build EDM4hep plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_FPEMON | Build FPE monitoring plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_FASTJET | Build FastJet plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_GEOMODEL | Build GeoModel plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_TRACCC | Build Traccc plugin<br> type: `bool`, default: `OFF` |
| ACTS_BUILD_PLUGIN_GEANT4 | Build Geant4 plugin<br> type: `bool`, default: `OFF` |