TMSS-1377 and TMSS-1521: merged TMSS-1521 into TMSS-1377, so TMSS-1377 is the...

TMSS-1377 and TMSS-1521: merged TMSS-1521 into TMSS-1377, so TMSS-1377 is the one and only TBB branch

CMake/LofarPackageList.cmake

 # - Create for each LOFAR package a variable containing the absolute path to
 # its source directory. 
 #
-# Generated by gen_LofarPackageList_cmake.sh at di  8 feb 2022 12:36:12 CET
+# Generated by gen_LofarPackageList_cmake.sh at di  8 feb 2022 14:07:17 CET
 #
 #                      ---- DO NOT EDIT ----
 #
@@ -236,7 +236,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(SAS_Tools_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/SAS_Tools)
   set(WinCC_DB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/WinCC_DB)
   set(SCU_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/SCU)
-  set(TBB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/TBB)
+  set(TBB_CEP_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/TBB_CEP)
   set(Dragnet_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/Dragnet)
   set(LTAIngest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LTAIngest)
   set(LTAIngestTransfer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LTAIngestTransfer)

SubSystems/CMakeLists.txt

@@ -12,7 +12,7 @@ lofar_add_package(SAS_OTDB)
 lofar_add_package(SAS_Tools)
 lofar_add_package(WinCC_DB)
 lofar_add_package(SCU)
-lofar_add_package(TBB)
+lofar_add_package(TBB_CEP)
 lofar_add_package(Dragnet)
 lofar_add_package(LTAIngest)
 lofar_add_package(LTAIngestTransfer)

SubSystems/TBB/CMakeLists.txt

-lofar_package(TBB DEPENDS TBBdatawriter)
-

SubSystems/TBB_CEP/CMakeLists.txt

+lofar_package(TBB_CEP DEPENDS TBBdatawriter)
+