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

Make a few cmake improvements #111

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Make a few cmake improvements #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f18857d
Remove a CMake warning and make it easier to build with ROOT
jmcarcell Sep 12, 2023
ae7b881
Remove ROOT::Physics
jmcarcell Sep 12, 2023
ed675c4
Fix test
jmcarcell Sep 12, 2023
fe4be3b
Update CMakeLists.txt
jmcarcell Sep 12, 2023
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: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.3)
cmake_minimum_required(VERSION 3.16)

project(k4SimDelphes)

Expand Down Expand Up @@ -78,6 +78,7 @@ endif()
#--- Non-optional Dependencies ------------------------------------------------
find_package(Delphes REQUIRED)
find_package(EDM4HEP REQUIRED)
find_package(ROOT REQUIRED)

#--- optional dependencies
if(BUILD_PYTHIA_READER OR BUILD_EVTGEN_READER)
Expand Down
2 changes: 1 addition & 1 deletion converter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target_link_libraries(DelphesEDM4HepConverter
podio::podio
ROOT::MathCore
ROOT::EG
ROOT::Physics)
)

install(DIRECTORY include/
TYPE INCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion framework/k4SimDelphes/examples/options/k4simdelphesalg_pythia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from Gaudi.Configuration import *
from GaudiKernel import SystemOfUnits as units
import os

from Configurables import ApplicationMgr
app = ApplicationMgr()
Expand Down
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target_include_directories(compare_delphes_converter_outputs
${PROJECT_SOURCE_DIR}/converter/src #for delphesHelpers
${PROJECT_SOURCE_DIR}/converter/include
)
target_link_libraries(compare_delphes_converter_outputs PRIVATE EDM4HEP::edm4hep ${DELPHES_LIBRARY} podio::podioRootIO ROOT::Physics)
target_link_libraries(compare_delphes_converter_outputs PRIVATE EDM4HEP::edm4hep EDM4HEP::kinematics ${DELPHES_LIBRARY} podio::podioRootIO ROOT::Core ROOT::MathCore ROOT::Physics)

function(ADD_COMPARISON_TEST name converter)
# Check if we have the standalone Delphes application available for the
Expand All @@ -29,7 +29,7 @@ function(ADD_COMPARISON_TEST name converter)
COMMAND bash -x ${PROJECT_SOURCE_DIR}/tests/testDriver.sh ${converter} ${ARGN})

set_property(TEST ${name} PROPERTY ENVIRONMENT
LD_LIBRARY_PATH=$<TARGET_FILE_DIR:DelphesEDM4HepConverter>:$<TARGET_FILE_DIR:EDM4HEP::edm4hepDict>:$<TARGET_FILE_DIR:podio::podioDict>:$<TARGET_FILE_DIR:ROOT::RIO>:$ENV{LD_LIBRARY_PATH}
LD_LIBRARY_PATH=$<TARGET_FILE_DIR:DelphesEDM4HepConverter>:$<TARGET_FILE_DIR:EDM4HEP::edm4hep>:$<TARGET_FILE_DIR:podio::podio>:$<TARGET_FILE_DIR:ROOT::RIO>:$ENV{LD_LIBRARY_PATH}
PATH=$<TARGET_FILE_DIR:${converter}>:${DELPHES_BINARY_DIR}:$ENV{PATH}
COMPARE=$<TARGET_FILE:compare_delphes_converter_outputs>
)
Expand Down
Loading