Skip to content

Remove UPS configuration. Update CMake Target specifications #6

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 #6

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
b80b485
Remove ups directory and CMakePresets.json that may refer to it. Chan…
eflumerf Feb 12, 2025
6153a9b
Merge branch 'develop' into eflumerf/RemoveUPS
eflumerf Mar 4, 2025
d17a4b0
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_stm VERSION 3.04.00)
project(otsdaq-mu2e-stm 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)


# XDAQ Extra setup
Expand Down
2 changes: 1 addition & 1 deletion otsdaq-mu2e-stm/FEInterfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

include(otsdaq::FEInterface)

cet_build_plugin(ROCStoppingTargetMonitorInterface otsdaq::FEInterface LIBRARIES REG otsdaq_mu2e::ROCCore
cet_build_plugin(ROCStoppingTargetMonitorInterface otsdaq::FEInterface LIBRARIES REG otsdaq-mu2e::ROCCore
)

install_headers()
Expand Down
54 changes: 0 additions & 54 deletions ups/product_deps
View file
Open in desktop

This file was deleted.

239 changes: 0 additions & 239 deletions ups/setup_deps
View file
Open in desktop

This file was deleted.

Loading
Loading