Skip to content

Remove UPS configuration. Update CMake Target specifications #14

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
matthewstortini merged 3 commits into from
Mar 18, 2025
Merged

Remove UPS configuration. Update CMake Target specifications #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5159c40
Remove ups directory and CMakePresets.json that may refer to it. Chan…
eflumerf Feb 12, 2025
18fd5bd
Merge branch 'develop' into eflumerf/RemoveUPS
eflumerf Mar 4, 2025
299ae3d
Update changed files, make sure dashes are used
eflumerf Mar 4, 2025
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR)

find_package(cetmodules 3.16.00 REQUIRED)

project(otsdaq_mu2e_dqm VERSION 3.04.00)
project(otsdaq-mu2e-dqm VERSION 3.04.00)

include(CetCMakeEnv)
cet_cmake_env()
Expand All @@ -30,7 +30,7 @@ cet_set_compiler_flags(DIAGS VIGILANT
#cet_report_compiler_flags()

# these are minimum required versions, not the actual product versions
find_package(otsdaq_mu2e 1.02.00 REQUIRED)
find_package(otsdaq-mu2e 1.02.00 REQUIRED)

#find_package(art_root_io 1.10.01 REQUIRED)

Expand Down
136 changes: 0 additions & 136 deletions CMakePresets.json
View file
Open in desktop

This file was deleted.

34 changes: 17 additions & 17 deletions otsdaq-mu2e-dqm/ArtModules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

cet_build_plugin(CaloDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::RecoDataProducts
ROOT::Hist
Expand All @@ -20,8 +20,8 @@ ROOT::Gui

cet_build_plugin(IntensityInfoDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::RecoDataProducts
ROOT::Hist
Expand All @@ -33,8 +33,8 @@ ROOT::Gui

cet_build_plugin(TrackerDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::DataProducts
Offline::RecoDataProducts
Expand All @@ -54,9 +54,9 @@ link_directories($ENV{BTRK_LIB})

cet_build_plugin(TriggerDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
artdaq-core-mu2e::Data
canvas::canvas
otsdaq_mu2e::otsdaq-mu2e_ArtModules
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::Mu2eUtilities
ROOT::Hist
Expand All @@ -69,9 +69,9 @@ ROOT::Gui

cet_build_plugin(SimpleDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
artdaq-core-mu2e::Data
canvas::canvas
otsdaq_mu2e::otsdaq-mu2e_ArtModules
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::Mu2eUtilities
ROOT::Hist
Expand All @@ -83,7 +83,7 @@ ROOT::Gui

cet_build_plugin(ReadTriggerCounts art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
artdaq-core-mu2e::Data
artdaq::ArtModules
Offline::BFieldGeom
Offline::ConditionsService
Expand All @@ -97,8 +97,8 @@ Offline::BFieldGeom

cet_build_plugin(CaloIERCDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::DataProducts
Offline::RecoDataProducts
Expand All @@ -112,8 +112,8 @@ ROOT::Gui

cet_build_plugin(CaloSiDETDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::DataProducts
Offline::RecoDataProducts
Expand All @@ -129,8 +129,8 @@ ROOT::Gui

cet_build_plugin(IntegrationDQM art::module LIBRARIES REG
art_root_io::TFileService_service
artdaq_core_mu2e::artdaq-core-mu2e_Data
otsdaq_mu2e::otsdaq-mu2e_ArtModules
artdaq-core-mu2e::Data
otsdaq-mu2e::ArtModules
otsdaq::NetworkUtilities
Offline::DataProducts
Offline::RecoDataProducts
Expand Down
40 changes: 0 additions & 40 deletions ups/product_deps
View file
Open in desktop

This file was deleted.

Loading
Loading