Merge pull request #36 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.19.02 REQUIRED)
 
-project(artdaq_mu2e VERSION 3.04.00)
+project(artdaq-mu2e VERSION 3.04.00)
 
 include(CetCMakeEnv)
 cet_cmake_env()
@@ -29,8 +29,8 @@ string(TOUPPER ${CMAKE_BUILD_TYPE} BTYPE_UC )
 #cet_report_compiler_flags()
 
 find_package(artdaq 3.12.00 REQUIRED EXPORT)
-find_package(artdaq_core_mu2e 1.08.00 REQUIRED EXPORT)
-find_package(mu2e_pcie_utils REQUIRED EXPORT)
+find_package(artdaq-core-mu2e 1.08.00 REQUIRED EXPORT)
+find_package(mu2e-pcie-utils REQUIRED EXPORT)
 
 include(BuildPlugins)
 

artdaq-mu2e/ArtModules/CMakeLists.txt

@@ -1,21 +1,21 @@
 
 cet_build_plugin(DTCEventDump art::module LIBRARIES REG
- artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+ artdaq-core-mu2e::Overlays
 )
 
 cet_build_plugin(DTCEventVerifier art::module LIBRARIES REG
- artdaq_core_mu2e::artdaq-core-mu2e_Data_dict
- artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+ artdaq-core-mu2e::Data_dict
+ artdaq-core-mu2e::Overlays
  artdaq::DAQdata
 )
 
 
 cet_build_plugin(OfflineFragmentsDumper art::module LIBRARIES REG
- artdaq_core_mu2e::artdaq-core-mu2e_Overlays
+ artdaq-core-mu2e::Overlays
 )
 
 cet_build_plugin(Mu2eArtdaqBuildInfo art::module LIBRARIES REG
-  artdaq_mu2e::artdaq-mu2e_BuildInfo
+  artdaq-mu2e::BuildInfo
 )
 
 cet_build_plugin(Mu2eArtdaqTimeTrackerService art::service LIBRARIES REG

artdaq-mu2e/BuildInfo/CMakeLists.txt

@@ -7,11 +7,10 @@ string( STRIP ${rawUTCDate} utcDateTime )
 configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/GetPackageBuildInfo.cc.in
   ${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc @ONLY )
 
-cet_make_library( LIBRARY_NAME artdaq-mu2e_BuildInfo
-                  SOURCE
+cet_make_library( SOURCE
 		  ${CMAKE_CURRENT_BINARY_DIR}/GetPackageBuildInfo.cc
           LIBRARIES PUBLIC
-         artdaq_core::artdaq-core_BuildInfo
+         artdaq-core::BuildInfo
          artdaq::BuildInfo
           )
 

artdaq-mu2e/Generators/CMakeLists.txt

@@ -1,30 +1,28 @@
 
-cet_make_library(LIBRARY_NAME artdaq-mu2e_Generators_Mu2eReceiverBase
+cet_make_library(LIBRARY_NAME Mu2eReceiverBase
 SOURCE 
 Mu2eEventReceiverBase.cc
 LIBRARIES PUBLIC
 artdaq::DAQdata
 canvas::canvas
-artdaq_core_mu2e::artdaq-core-mu2e_Overlays
-mu2e_pcie_utils::DTCInterface
+artdaq-core-mu2e::Overlays
+mu2e-pcie-utils::DTCInterface
 artdaq_plugin_types::CommandableFragmentGenerator
   )
 
 include(artdaq::commandableGenerator)
 
-cet_build_plugin(Mu2eEventReceiver artdaq::commandableGenerator LIBRARIES REG artdaq_mu2e::artdaq-mu2e_Generators_Mu2eReceiverBase
+cet_build_plugin(Mu2eEventReceiver artdaq::commandableGenerator LIBRARIES REG artdaq-mu2e::Mu2eReceiverBase
   )
 
 cet_build_plugin(Mu2eSubEventReceiver artdaq::commandableGenerator
   LIBRARIES REG 
-  artdaq_core_mu2e::artdaq-core-mu2e_Overlays
-  mu2e_pcie_utils::DTCInterface
+  artdaq-core-mu2e::Overlays
+  mu2e-pcie-utils::DTCInterface
   artdaq_plugin_types::CommandableFragmentGenerator
 )
 
-cet_build_plugin(CRVReceiver artdaq::commandableGenerator LIBRARIES REG artdaq_mu2e::artdaq-mu2e_Generators_Mu2eReceiverBase)
-
-
+cet_build_plugin(CRVReceiver artdaq::commandableGenerator LIBRARIES REG artdaq-mu2e::Mu2eReceiverBase)
 
 #get_cmake_property(_variableNames VARIABLES)
 #foreach (_variableName ${_variableNames})