Merge pull request #13 from Mu2e/eflumerf/RemoveUPS

Remove UPS configuration. Update CMake Target specifications

Author: matthewstortini

CMakeLists.txt

@@ -10,7 +10,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.16.00 REQUIRED)
 
-project(otsdaq_mu2e_crv VERSION 3.04.00)
+project(otsdaq-mu2e-crv VERSION 3.04.00)
 
 include(CetCMakeEnv)
 cet_cmake_env()
@@ -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
  include_directories($ENV{XDAQ_ROOT}/include/linux $ENV{XDAQ_ROOT}/include)

otsdaq-mu2e-crv/ArtModules/CMakeLists.txt

@@ -5,16 +5,16 @@ cet_build_plugin(CrvVstDemoViewer art::module LIBRARIES
     TRACE::TRACE 
     ROOT::Core 
     ROOT::Gui
-    artdaq_core_mu2e::artdaq-core-mu2e_Data_dict
-    artdaq_core_mu2e::artdaq-core-mu2e_Overlays
-    artdaq_core_mu2e::artdaq-core-mu2e_Data
+    artdaq-core-mu2e::Data_dict
+    artdaq-core-mu2e::Overlays
+    artdaq-core-mu2e::Data
     artdaq::DAQdata
 )
 
 cet_build_plugin(CrvDQM 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
     ROOT::Hist
     ROOT::Tree

otsdaq-mu2e-crv/FEInterfaces/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 include(otsdaq::FEInterface)
 
-cet_build_plugin(ROCCosmicRayVetoInterface otsdaq::FEInterface LIBRARIES REG otsdaq_mu2e::ROCCore
+cet_build_plugin(ROCCosmicRayVetoInterface otsdaq::FEInterface LIBRARIES REG otsdaq-mu2e::ROCCore
  )