Rename FairRoot::FairDataMatch to FairRoot::DataMatch

FairRootGroup · Nov 14, 2022 · dc9001b · dc9001b
1 parent 8e55442
commit dc9001b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,6 +86,7 @@ file an issue, so that we can see how to handle this.
   | Old Library Name | Target Name           |
   | ---              | ---                   |
   | TrkBase          | `FairRoot::TrackBase` |
+  | FairDataMatch    | `FairRoot::DataMatch` |
 
   All those not listed here have the library name prefixed
   with `FairRoot::` as the target name.

diff --git a/datamatch/CMakeLists.txt b/datamatch/CMakeLists.txt
@@ -1,12 +1,12 @@
 ################################################################################
-# Copyright (C) 2014-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
 #                  copied verbatim in the file "LICENSE"                       #
 ################################################################################
 
-set(target FairDataMatch)
+set(target DataMatch)
 
 set(sources
   FairMCDataCrawler.cxx
@@ -25,6 +25,8 @@ fair_change_extensions_if_exists(.cxx .h FILES "${sources}" OUTVAR headers)
 
 add_library(${target} SHARED ${sources} ${headers})
 fairroot_library_settings(${target})
+# Keep old filesystem name
+set_target_properties(${target} PROPERTIES OUTPUT_NAME FairDataMatch)
 
 target_include_directories(${target} PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -42,7 +44,7 @@ target_link_libraries(${target} PUBLIC
 
 fairroot_target_root_dictionary(${target}
   HEADERS ${headers}
-  LINKDEF FairMCMatchLinkDef.h
+  LINKDEF LinkDef.h
   EXTRA_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR}
 )
 

diff --git a/datamatch/FairMCMatchLinkDef.h → datamatch/LinkDef.h b/datamatch/FairMCMatchLinkDef.h → datamatch/LinkDef.h
@@ -1,15 +1,16 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
- *              This software is distributed under the terms of the             * 
- *              GNU Lesser General Public Licence (LGPL) version 3,             *  
+ *              This software is distributed under the terms of the             *
+ *              GNU Lesser General Public Licence (LGPL) version 3,             *
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 #ifdef __CINT__
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
+// clang-format off
 
 #pragma link C++ class FairMCMatch+;
 #pragma link C++ class FairMCMatchCreatorTask+;
@@ -22,5 +23,5 @@
 #pragma link C++ class FairMCResult+;
 #pragma link C++ class FairMCDataCrawler+;
 
+// clang-format on
 #endif
-
diff --git a/datamatch/README.dox b/datamatch/README.dox
@@ -14,6 +14,6 @@ This functionality is performed with the help of `FairLink`s, where
 for every created data object a list of `FairLink`s is created, pointing to
 all of the data used to create that very data object, with the pointers to the event number, data's array and data's position in that array. With this information it is possible to compare the reconstructed data with the simulated one.
 
-The CMake target name for this library is `FairRoot::FairDataMatch`.
+The CMake target name for this library is `FairRoot::DataMatch`.
 
  */