Merge pull request #32 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_calorimeter VERSION 3.04.00)
+project(otsdaq-mu2e-calorimeter VERSION 4.00.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-calorimeter/ArtModules/CMakeLists.txt

@@ -4,22 +4,22 @@ link_directories($ENV{KINKAL_LIB})
 link_directories($ENV{BTRK_LIB})
 
 cet_build_plugin(testFragments art::module LIBRARIES REG
- artdaq_core_mu2e::artdaq-core-mu2e_Overlays art_root_io::TFileService_service ROOT::Hist
+ artdaq-core-mu2e::Overlays art_root_io::TFileService_service ROOT::Hist
  )
 
 cet_build_plugin(CaloDataVerifier art::module LIBRARIES REG
- artdaq_core_mu2e::artdaq-core-mu2e_Data
- artdaq_core_mu2e::artdaq-core-mu2e_Data_dict
- artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+ artdaq-core-mu2e::Data
+ artdaq-core-mu2e::Data_dict
+ artdaq-core-mu2e::Overlays
  artdaq::DAQdata
 )
 
 cet_build_plugin(CaloDataAnalyzer art::module
     REG_SOURCE CaloDataAnalyzer_module.cc
     LIBRARIES REG
-     artdaq_core_mu2e::artdaq-core-mu2e_Data
-     artdaq_core_mu2e::artdaq-core-mu2e_Data_dict
-     artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+     artdaq-core-mu2e::Data
+     artdaq-core-mu2e::Data_dict
+     artdaq-core-mu2e::Overlays
      artdaq::DAQdata
      art_root_io::TFileService_service
      Offline::DAQ
@@ -44,9 +44,9 @@ cet_build_plugin(CaloiercAnalyzer art::module
 cet_build_plugin(CaloEventFilter art::module
     REG_SOURCE CaloEventFilter_module.cc
     LIBRARIES REG
-      artdaq_core_mu2e::artdaq-core-mu2e_Data
-      artdaq_core_mu2e::artdaq-core-mu2e_Data_dict
-      artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+      artdaq-core-mu2e::Data
+      artdaq-core-mu2e::Data_dict
+      artdaq-core-mu2e::Overlays
       artdaq::DAQdata
 )
 

otsdaq-mu2e-calorimeter/FEInterfaces/CMakeLists.txt

@@ -15,8 +15,8 @@ cet_make_library(
 cet_build_plugin(ROCCalorimeterInterface
   otsdaq::FEInterface
   LIBRARIES REG
-  otsdaq_mu2e::ROCPolarFireCoreInterface
-  otsdaq_mu2e_calorimeter::FEInterfaces
+  otsdaq-mu2e::ROCPolarFireCoreInterface
+  otsdaq-mu2e-calorimeter::FEInterfaces
   otsdaq::Macros
   )
 

otsdaq-mu2e-calorimeter/Generators/CMakeLists.txt

@@ -2,10 +2,10 @@
 include(artdaq::commandableGenerator)
 
 cet_build_plugin(Mu2eCaloEventReceiver   artdaq::commandableGenerator LIBRARIES 
-			       REG artdaq_mu2e::artdaq-mu2e_Generators_Mu2eReceiverBase artdaq_core_mu2e::artdaq-core-mu2e_Overlays canvas::canvas mu2e_pcie_utils::DTCInterface)
+			       REG artdaq-mu2e::Mu2eReceiverBase artdaq-core-mu2e::Overlays canvas::canvas mu2e-pcie-utils::DTCInterface)
 
 
 cet_build_plugin(CalorimeterVST   artdaq::commandableGenerator LIBRARIES 
-			       REG artdaq_mu2e::artdaq-mu2e_Generators_Mu2eReceiverBase artdaq_core_mu2e::artdaq-core-mu2e_Overlays canvas::canvas mu2e_pcie_utils::DTCInterface)
+			       REG artdaq-mu2e::Mu2eReceiverBase artdaq-core-mu2e::Overlays canvas::canvas mu2e-pcie-utils::DTCInterface)
 # cet_build_plugin(CalorimeterVST    artdaq::commandableGenerator LIBRARIES 
-# 			       REG artdaq_core_mu2e::artdaq-core-mu2e_Overlays canvas::canvas mu2e_pcie_utils::DTCInterface)
+# 			       REG artdaq-core-mu2e::Overlays canvas::canvas mu2e-pcie-utils::DTCInterface)