Skip to content

Changes needed to build and test with spack mpd #107

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

Open
gartung wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Changes needed to build and test with spack mpd #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d84ae2
Set environment variables for tests. Add CMake targets for includes.
gartung Jul 8, 2026
0d3e85e
Remove trailing whitespaces
gartung Jul 9, 2026
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
7 changes: 7 additions & 0 deletions duneprototypes/Coldbox/vd/Tools/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@

include(CetTest)

cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${dunedataprep_BINARY_DIR}/fcl)
cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data ${dunedataprep_BINARY_DIR}/config_data)

cet_test(test_VDColdboxChannelRanges SOURCE test_VDColdboxChannelRanges.cxx
LIBRARIES
dunecore::ArtSupport
Expand Down
3 changes: 3 additions & 0 deletions duneprototypes/Protodune/hd/ChannelMap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include_directories($ENV{NLOHMANN_JSON_INC})
include_directories("${nlohmann_json_DIR}/../../../include")

install_fhicl()
install_headers()
Expand All @@ -15,4 +16,6 @@ art_make(SERVICE_LIBRARIES
messagefacility::MF_MessageLogger
ROOT::Core
duneprototypes::Protodune_hd_ChannelMap
LIB_LIBRARIES
nlohmann_json::nlohmann_json
)
9 changes: 8 additions & 1 deletion duneprototypes/Protodune/hd/Tool/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
# June 2021

# Build test for each tool.
include(CetTest)

cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl)
cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data)

cet_test(test_PdhdChannelRanges SOURCE test_PdhdChannelRanges.cxx
LIBRARIES
Expand All @@ -30,4 +38,3 @@ cet_test(test_PdhdChannelGroups SOURCE test_PdhdChannelGroups.cxx
SQLite::SQLite3
Boost::filesystem
)
include(CetTest)
8 changes: 8 additions & 0 deletions duneprototypes/Protodune/hd/fcl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@

include(CetTest)

cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data)
cet_test_env_prepend(FW_SEARCH_PATH ${dunepdlegacy_BINARY_DIR}/files ${PROJECT_BINARY_PATH}/config_files)

cet_test(test_fcl_pdhdChannelFemb SOURCE test_fcl_pdhdChannelFemb.cxx
LIBRARIES
dunecore::ArtSupport
Expand Down
25 changes: 17 additions & 8 deletions duneprototypes/Protodune/singlephase/BeamReco/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

include_directories("${dunedetdataformats_DIR}/../../../include")
cet_build_plugin( BeamEvent art::module LIBRARIES
cet_build_plugin( BeamEvent art::module LIBRARIES
dunecore::ArtSupport
ifbeam::ifbeam
ifdh_art::IFBeam_service
Expand All @@ -14,14 +14,14 @@ cet_build_plugin( BeamEvent art::module LIBRARIES
lardata::ArtDataHelper
lardata::Utilities
lardataalg::UtilitiesHeaders
larsim::Simulation
larsim::Simulation
lardataobj::Simulation
dunecore::DuneObj
#dune_raw_data::dune-raw-data_Services_ChannelMap_PdspChannelMapService_service
larsim::MCCheater_PhotonBackTrackerService_service
larsim::MCCheater_BackTrackerService_service
larsim::MCCheater_ParticleInventoryService_service
nug4::ParticleNavigation
nug4::ParticleNavigation
nusimdata::SimulationBase
art::Framework_Core
art::Framework_Principal
Expand All @@ -43,21 +43,30 @@ find_library(IFDH ifdh)
cet_make_exec(
test_ifbeam
SOURCE test_ifbeam.c++
LIBRARIES
IFBEAM
IFDH
LIBRARIES
ifdh::ifdh
ifdh_art::IFBeam_service
#IFBEAM
#IFDH
#wda
#curl
)

target_include_directories(
test_ifbeam
PUBLIC
PUBLIC
$ENV{IFDH_ART_INC}
$ENV{IFDHC_INC}
"$ENV{LIBWDA_FQ_DIR}/include"
"$ENV{IFBEAM_FQ_DIR}/include"
)
)

target_link_libraries(
test_ifbeam
PRIVATE
ifdh::ifdh
ifbeam::ifbeam
)


install_headers()
Expand Down
6 changes: 6 additions & 0 deletions duneprototypes/Protodune/singlephase/Tool/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@

include(CetTest)

cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
cet_test_env_prepend(FW_SEARCH_PATH ${dunepdlegacy_BINARY_DIR}/files ${PROJECT_BINARY_PATH}/config_files)

cet_test(test_PdspOnlineChannel SOURCE test_PdspOnlineChannel.cxx
LIBRARIES
dunecore::ArtSupport
Expand Down
5 changes: 5 additions & 0 deletions duneprototypes/Protodune/singlephase/Utility/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

include(CetTest)

cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})

cet_test(test_ProtoduneChannelHelper SOURCE test_ProtoduneChannelHelper.cxx
LIBRARIES
duneprototypes_Protodune_singlephase_Utility
Expand Down