Fix unrelocatable stuff

2025-10-15 17:41:44 +00:00 · 2021-03-07 10:13:35 +01:00
19 changed files with 517 additions and 417 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -7,12 +7,11 @@
 ################################################################################

 cmake_minimum_required(VERSION 3.9.4 FATAL_ERROR)
-cmake_policy(VERSION 3.9...3.19)
+cmake_policy(VERSION 3.9...3.15)

 # Project ######################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FairLoggerLib)
-include(FairFindPackage2)

 get_git_version()

@@ -54,24 +53,26 @@ add_library(FairLogger
  logger/Logger.cxx
  logger/Logger.h
 )
-target_compile_features(FairLogger PUBLIC cxx_std_14)

 if(USE_BOOST_PRETTY_FUNCTION)
  target_link_libraries(FairLogger PUBLIC Boost::boost)
  target_compile_definitions(FairLogger PUBLIC FAIRLOGGER_USE_BOOST_PRETTY_FUNCTION)
 endif()

+# legacy paths
+list(APPEND FAIRLOGGER_INSTALL_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+
 if(USE_EXTERNAL_FMT)
  target_link_libraries(FairLogger PUBLIC fmt::fmt)
 else()
  add_library(fmt INTERFACE)
  target_include_directories(fmt INTERFACE
    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/logger/bundled>
-    $<INSTALL_INTERFACE:${PROJECT_INSTALL_BUNDLEDINCDIR}>
+    $<INSTALL_INTERFACE:${PROJECT_INSTALL_INCDIR}/bundled>
  )
-  target_compile_features(fmt INTERFACE cxx_std_11)
  target_compile_definitions(fmt INTERFACE FMT_HEADER_ONLY)
  target_link_libraries(FairLogger PUBLIC fmt)
+  list(APPEND FAIRLOGGER_INSTALL_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_INCDIR}/bundled)
 endif()

 if(DEFINED FAIR_MIN_SEVERITY)
@@ -155,14 +156,6 @@ if(BUILD_TESTING)
 endif()
 ################################################################################

-# Utils ########################################################################
-find_program(BASH bash HINTS "/bin")
-find_program(SINGULARITY singularity)
-if(BASH AND SINGULARITY)
-  add_subdirectory(test/ci)
-endif()
-################################################################################
-
 # Summary ######################################################################
 message(STATUS "  ")
 message(STATUS "  ${Cyan}CXX STANDARD${CR}       ${BGreen}C++${CMAKE_CXX_STANDARD}${CR} (>= C++${PROJECT_MIN_CXX_STANDARD}, change with ${BMagenta}-DCMAKE_CXX_STANDARD=17${CR})")
--- a/Dart.sh
+++ b/Dart.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+
+function print_example(){
+echo "##################################################################"
+echo "# To set the required parameters as source and the build         #"
+echo "# directory for ctest, the linux flavour and the SIMPATH         #"
+echo "# put the export commands below to a separate file which is read #"
+echo "# during execution and which is defined on the command line.     #"
+echo "# Set all parameters according to your needs.                    #"
+echo "# LINUX_FLAVOUR should be set to the distribution you are using  #"
+echo "# eg Debian, SuSe etc.                                           #"
+echo "# An additional varibale NCPU can overwrite the default number   #"
+echo "# of parallel processes used to compile the project.             #"
+echo "# This can be usefull if one can use a distributed build system  #"
+echo "# like icecream.                                                 #"
+echo "# For example                                                    #"
+echo "#!/bin/bash                                                      #"
+echo "export LINUX_FLAVOUR=<your linux flavour>                        #"
+echo "export FAIRSOFT_VERSION=<version of FairSoft>                    #"
+echo "export SIMPATH=<path to your FairSoft version>                   #"
+echo "export GIT_BRANCH=< master or dev>                               #"
+echo "export BUILDDIR=<dir where the build files go>                   #"
+echo "export SOURCEDIR=<location of the FairRoot sources>              #"
+echo "#export NCPU=100                                                 #"
+echo "##################################################################"
+}
+
+if [ "$#" -lt "2" ]; then
+  echo ""
+  echo "-- Error -- Please start script with two parameters"
+  echo "-- Error -- The first parameter is the ctest model."
+  echo "-- Error -- Possible arguments are Nightly, Experimental, "
+  echo "-- Error -- Continuous or Profile."
+  echo "-- Error -- The second parameter is the file containg the"
+  echo "-- Error -- Information about the setup at the client"
+  echo "-- Error -- installation (see example below)."
+  echo ""
+  print_example
+  exit 1
+fi
+
+# test if a valid ctest model is defined
+if [ "$1" == "Experimental" -o "$1" == "Nightly" -o "$1" == "Continuous" -o "$1" == "Profile" -o "$1" == "alfa_ci" ]; then
+  echo ""
+else
+  echo "-- Error -- This ctest model is not supported."
+  echo "-- Error -- Possible arguments are Nightly, Experimental, Continuous or Profile."
+  exit 1
+fi
+
+# test if the input file exists and execute it
+if [ -e "$2" ];then
+  source $2
+else
+  echo "-- Error -- Input file does not exist."
+  echo "-- Error -- Please choose existing input file."
+  exit 1
+fi
+
+# set the ctest model to command line parameter
+if [ "$1" == "alfa_ci" ]; then
+  export ctest_model=Experimental
+else
+  export ctest_model=$1
+fi
+
+
+# test for architecture
+arch=$(uname -s | tr '[A-Z]' '[a-z]')
+chip=$(uname -m | tr '[A-Z]' '[a-z]')
+
+# extract information about the system and the machine and set
+# environment variables used by ctest
+SYSTEM=$arch-$chip
+if test -z $CXX ; then
+  if [ "$arch" == "darwin" ]; then
+    COMPILER=$(clang --version | head -n 1 | cut -d' ' -f1,2,4 | tr -d ' ')
+  else
+    COMPILER=gcc$(gcc -dumpversion)
+  fi
+else
+  COMPILER=$CXX$($CXX -dumpversion)
+fi
+
+if [ "$1" == "alfa_ci" ]; then
+  export LABEL1=alfa_ci-$COMPILER-FairLogger_$GIT_BRANCH
+  export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
+else
+  export LABEL1=${LINUX_FLAVOUR}-$chip-$COMPILER-FairLogger_$GIT_BRANCH
+  export LABEL=$(echo $LABEL1 | sed -e 's#/#_#g')
+fi
+
+# get the number of processors
+# and information about the host
+if [ "$arch" = "linux" ];
+then
+  if [ "$NCPU" != "" ];
+  then
+    export number_of_processors=$NCPU
+  else
+    export number_of_processors=$(cat /proc/cpuinfo | grep processor | wc -l)
+  fi
+  if [ -z "$SITE" ]; then
+    export SITE=$(hostname -f)
+    if [ -z "$SITE" ]; then
+      export SITE=$(uname -n)
+    fi
+  fi
+elif [ "$arch" = "darwin" ];
+then
+  if [ "$NCPU" != "" ];
+  then
+    export number_of_processors=$NCPU
+  else
+    export number_of_processors=$(sysctl -n hw.ncpu)
+  fi
+  if [ -z "$SITE" ]; then
+    export SITE=$(hostname -s)
+  fi
+fi
+
+echo "************************"
+date
+echo "LABEL: " $LABEL
+echo "SITE: " $SITE
+echo "Model: " ${ctest_model}
+echo "Nr. of processes: " $number_of_processors
+echo "************************"
+
+cd $SOURCEDIR
+
+ctest -S FairLoggerTest.cmake -V --VV
--- a/FairLoggerTest.cmake
+++ b/FairLoggerTest.cmake
@@ -1,62 +1,69 @@
 ################################################################################
-#    Copyright (C) 2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
+#    Copyright (C) 2014 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(CTEST_SOURCE_DIRECTORY $ENV{SOURCEDIR})
+Set(CTEST_BINARY_DIRECTORY $ENV{BUILDDIR})
+Set(CTEST_SITE $ENV{SITE})
+Set(CTEST_BUILD_NAME $ENV{LABEL})
+Set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+Set(CTEST_PROJECT_NAME "FairLogger")

-cmake_host_system_information(RESULT fqdn QUERY FQDN)
+Find_Program(CTEST_GIT_COMMAND NAMES git)
+Set(CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

-set(CTEST_SOURCE_DIRECTORY .)
-set(CTEST_BINARY_DIRECTORY build)
-set(CTEST_CMAKE_GENERATOR "Ninja")
-set(CTEST_USE_LAUNCHERS ON)
-set(CTEST_CONFIGURATION_TYPE "RelWithDebInfo")
+Set(BUILD_COMMAND "make")
+Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -j$ENV{number_of_processors}")

-if(NOT NCPUS)
-  if(ENV{SLURM_CPUS_PER_TASK})
-    set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
-  else()
-    include(ProcessorCount)
-    ProcessorCount(NCPUS)
-    if(NCPUS EQUAL 0)
-      set(NCPUS 1)
-    endif()
-  endif()
-endif()
+String(TOUPPER $ENV{ctest_model} _Model)
+Set(configure_options "-DCMAKE_BUILD_TYPE=${_Model}")

-if ("$ENV{CTEST_SITE}" STREQUAL "")
-  set(CTEST_SITE "${fqdn}")
-else()
-  set(CTEST_SITE $ENV{CTEST_SITE})
-endif()
+Set(CTEST_USE_LAUNCHERS 1)
+Set(configure_options "${configure_options};-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}")

-if ("$ENV{LABEL}" STREQUAL "")
-  set(CTEST_BUILD_NAME "build")
-else()
-  set(CTEST_BUILD_NAME $ENV{LABEL})
-endif()
+Set(configure_options "${configure_options};-DDISABLE_COLOR=ON")

-ctest_start(Continuous)
+Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
+If(EXTRA_FLAGS)
+  Set(configure_options "${configure_options};${EXTRA_FLAGS}") 
+EndIf()

-list(APPEND options
-  "-DDISABLE_COLOR=ON"
-  "-DUSE_EXTERNAL_FMT=ON"
-  "-DUSE_BOOST_PRETTY_FUNCTION=ON"
-  )
-list(JOIN options ";" optionsstr)
-ctest_configure(OPTIONS "${optionsstr}")
+If($ENV{ctest_model} MATCHES Nightly OR $ENV{ctest_model} MATCHES Profile)

-ctest_build(FLAGS "-j${NCPUS}")
+  Find_Program(GCOV_COMMAND gcov)
+  If(GCOV_COMMAND)
+    Message("Found GCOV: ${GCOV_COMMAND}")
+    Set(CTEST_COVERAGE_COMMAND ${GCOV_COMMAND})
+  EndIf(GCOV_COMMAND)

-ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}"
-           PARALLEL_LEVEL 1
-           SCHEDULE_RANDOM ON
-           RETURN_VALUE _ctest_test_ret_val)
+  Set(ENV{ctest_model} Nightly)

-ctest_submit()
+  CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})

-if(_ctest_test_ret_val)
+EndIf()
+
+Ctest_Start($ENV{ctest_model})
+
+Ctest_Configure(BUILD "${CTEST_BINARY_DIRECTORY}"
+                OPTIONS "${configure_options}"
+               )
+
+Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}")
+
+Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}" 
+           PARALLEL_LEVEL $ENV{number_of_processors}
+           RETURN_VALUE _ctest_test_ret_val
+          )
+
+If(GCOV_COMMAND)
+  Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}")
+EndIf()
+
+Ctest_Submit()
+ 
+if (_ctest_test_ret_val)
  Message(FATAL_ERROR "Some tests failed.")
 endif()
--- a/80
+++ b/80
@@ -1,43 +1,50 @@
 #!groovy

-def jobMatrix(String prefix, String type, List specs) {
+def specToLabel(Map spec) {
+  return "${spec.os}-${spec.arch}-${spec.compiler}-FairSoft_${spec.fairsoft}"
+}
+
+def jobMatrix(String prefix, List specs, Closure callback) {
  def nodes = [:]
  for (spec in specs) {
-    job = "${spec.os}-${spec.ver}-${spec.arch}-${spec.compiler}"
-    def label = "${type}/${job}"
-    def selector = "${spec.os}-${spec.ver}-${spec.arch}"
+    def label = specToLabel(spec)
+    def fairsoft = spec.fairsoft
    def os = spec.os
-    def ver = spec.ver
-    def check = spec.check
-
-    nodes[label] = {
-      node(selector) {
+    def compiler = spec.compiler
+    nodes["${prefix}/${label}"] = {
+      node(label) {
        githubNotify(context: "${prefix}/${label}", description: 'Building ...', status: 'PENDING')
        try {
          deleteDir()
          checkout scm

-          def jobscript = 'job.sh'
-          def ctestcmd = "ctest -S FairLoggerTest.cmake -V --output-on-failure"
-          sh "echo \"set -e\" >> ${jobscript}"
-          sh "echo \"export LABEL=\\\"\${JOB_BASE_NAME} ${label}\\\"\" >> ${jobscript}"
-          if (selector =~ /^macos/) {
-            sh "echo \"${ctestcmd}\" >> ${jobscript}"
-            sh "cat ${jobscript}"
-            sh "bash ${jobscript}"
-          } else {
-            def containercmd = "singularity exec -B/shared ${env.SINGULARITY_CONTAINER_ROOT}/fairlogger/${os}.${ver}.sif bash -l -c \\\"${ctestcmd}\\\""
-            sh """\
-              echo \"echo \\\"*** Job started at .......: \\\$(date -R)\\\"\" >> ${jobscript}
-              echo \"echo \\\"*** Job ID ...............: \\\${SLURM_JOB_ID}\\\"\" >> ${jobscript}
-              echo \"echo \\\"*** Compute node .........: \\\$(hostname -f)\\\"\" >> ${jobscript}
-              echo \"unset http_proxy\" >> ${jobscript}
-              echo \"unset HTTP_PROXY\" >> ${jobscript}
-              echo \"${containercmd}\" >> ${jobscript}
-            """
-            sh "cat ${jobscript}"
-            sh "test/ci/slurm-submit.sh \"FairLogger \${JOB_BASE_NAME} ${label}\" ${jobscript}"
+          sh """\
+            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
+            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
+          """
+          if (os =~ /Debian/ && compiler =~ /gcc9/) {
+            sh '''\
+              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
+              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
+              echo "module load compiler/gcc/9.1.0" >> Dart.cfg
+            '''
          }
+          if (os =~ /MacOS/) {
+            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=clang++'\" >> Dart.cfg"
+          } else {
+            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=g++'\" >> Dart.cfg"
+          }
+
+          sh '''\
+            echo "export BUILDDIR=$PWD/build" >> Dart.cfg
+            echo "export SOURCEDIR=$PWD" >> Dart.cfg
+            echo "export PATH=\\\$SIMPATH/bin:\\\$PATH" >> Dart.cfg
+            echo "export GIT_BRANCH=$JOB_BASE_NAME" >> Dart.cfg
+            echo "echo \\\$PATH" >> Dart.cfg
+          '''
+          sh 'cat Dart.cfg'
+
+          callback.call(spec, label)

          deleteDir()
          githubNotify(context: "${prefix}/${label}", description: 'Success', status: 'SUCCESS')
@@ -58,14 +65,13 @@ pipeline{
    stage("Run CI Matrix") {
      steps{
        script {
-          def builds = jobMatrix('alfa-ci', 'build', [
-            [os: 'fedora', ver: '32',    arch: 'x86_64', compiler: 'gcc-10'],
-            [os: 'fedora', ver: '33',    arch: 'x86_64', compiler: 'gcc-10'],
-            [os: 'fedora', ver: '34',    arch: 'x86_64', compiler: 'gcc-11'],
-            [os: 'macos',  ver: '11',    arch: 'x86_64', compiler: 'apple-clang-12'],
-          ])
-
-          parallel(builds)
+          parallel(jobMatrix('alfa-ci/build', [
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc9.1.0',        fairsoft: 'fairmq_dev'],
+            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+          ]) { spec, label ->
+            sh './Dart.sh alfa_ci Dart.cfg'
+          })
        }
      }
    }
--- a/Jenkinsfile.nightly
+++ b/Jenkinsfile.nightly
@@ -0,0 +1,77 @@
+#!groovy
+
+def specToLabel(Map spec) {
+  return "${spec.os}-${spec.arch}-${spec.compiler}-FairSoft_${spec.fairsoft}"
+}
+
+def buildMatrix(List specs, Closure callback) {
+  def nodes = [:]
+  for (spec in specs) {
+    def label = specToLabel(spec)
+    def fairsoft = spec.fairsoft
+    def os = spec.os
+    def compiler = spec.compiler
+    nodes[label] = {
+      node(label) {
+        try {
+          deleteDir()
+          checkout scm
+
+          sh """\
+            echo "export SIMPATH=\${SIMPATH_PREFIX}${fairsoft}" >> Dart.cfg
+            echo "export FAIRSOFT_VERSION=${fairsoft}" >> Dart.cfg
+          """
+          if (os =~ /Debian/ && compiler =~ /gcc9/) {
+            sh '''\
+              echo "source /etc/profile.d/modules.sh" >> Dart.cfg
+              echo "module use /cvmfs/it.gsi.de/modulefiles" >> Dart.cfg
+              echo "module load compiler/gcc/9.1.0" >> Dart.cfg
+            '''
+          }
+          if (os =~ /MacOS/) {
+            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=clang++'\" >> Dart.cfg"
+          } else {
+            sh "echo \"export EXTRA_FLAGS='-DCMAKE_CXX_COMPILER=g++'\" >> Dart.cfg"
+          }
+          sh '''\
+            echo "export BUILDDIR=$PWD/build" >> Dart.cfg
+            echo "export SOURCEDIR=$PWD" >> Dart.cfg
+            echo "export PATH=\\\$SIMPATH/bin:\\\$PATH" >> Dart.cfg
+            echo "export GIT_BRANCH=dev" >> Dart.cfg
+            echo "echo \\\$PATH" >> Dart.cfg
+          '''
+          sh 'cat Dart.cfg'
+
+          callback.call(spec, label)
+
+          deleteDir()
+        } catch (e) {
+          deleteDir()
+          throw e
+        }
+      }
+    }
+  }
+  return nodes
+}
+
+pipeline{
+  agent none
+  triggers { cron('H 2 * * *') }
+  stages {
+    stage("Run Nightly Build/Test Matrix") {
+      steps{
+        script {
+          parallel(buildMatrix([
+            [os: 'Debian8',    arch: 'x86_64', compiler: 'gcc9.1.0',        fairsoft: 'fairmq_dev'],
+            [os: 'MacOS10.13', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+            [os: 'MacOS10.14', arch: 'x86_64', compiler: 'AppleLLVM10.0.0', fairsoft: 'fairmq_dev'],
+          ]) { spec, label ->
+            sh './Dart.sh Nightly Dart.cfg'
+            sh './Dart.sh Profile Dart.cfg'
+          })
+        }
+      }
+    }
+  }
+}
--- a/README.md
+++ b/README.md
@@ -96,8 +96,6 @@ where severity level is one of the following:
 "info",
 "state",
 "warn",
-"important",
-"alarm",
 "error",
 "fatal",
 ```
@@ -236,4 +234,4 @@ Define an option `FAIR_NO_LOG*` to prevent the above unprefixed macros to be def

 GNU Lesser General Public Licence (LGPL) version 3, see [LICENSE](LICENSE).

-Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
+Copyright (C) 2017-2020 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH
--- a/cmake/FairFindPackage2.cmake
+++ b/cmake/FairFindPackage2.cmake
@@ -1,102 +0,0 @@
-################################################################################
-# Copyright (C) 2018-2021 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"                       #
-################################################################################
-
-#
-# find_package2(PRIVATE|PUBLIC|INTERFACE <pkgname>
-#               [VERSION <version>]
-#               [COMPONENTS <list of components>]
-#               [ADD_REQUIREMENTS_OF <list of dep_pgkname>]
-#               [any other option the native find_package supports]...)
-#
-# Wrapper around CMake's native find_package command to add some features and bookkeeping.
-#
-# The qualifier (PRIVATE|PUBLIC|INTERFACE) to the package to populate
-# the variables PROJECT_[INTERFACE]_<pkgname>_([VERSION]|[COMPONENTS]|PACKAGE_DEPENDENCIES)
-# accordingly. This bookkeeping information is used to print our dependency found summary
-# table and to generate a part of our CMake package.
-#
-# When a dependending package is listed with ADD_REQUIREMENTS_OF the variables
-# <dep_pkgname>_<pkgname>_VERSION|COMPONENTS are looked up to and added to the native
-# VERSION (selected highest version) and COMPONENTS (deduplicated) args.
-#
-# COMPONENTS and VERSION args are then just passed to the native find_package.
-#
-macro(find_package2 qualifier pkgname)
-  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS;ADD_REQUIREMENTS_OF" ${ARGN})
-
-  string(TOUPPER ${pkgname} pkgname_upper)
-  set(__old_cpp__ ${CMAKE_PREFIX_PATH})
-  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
-
-  # build lists of required versions and components
-  unset(__required_versions__)
-  unset(__components__)
-  if(ARGS_VERSION)
-    list(APPEND __required_versions__ ${ARGS_VERSION})
-  endif()
-  if(ARGS_COMPONENTS)
-    list(APPEND __components__ ${ARGS_COMPONENTS})
-  endif()
-  if(ARGS_ADD_REQUIREMENTS_OF)
-    foreach(dep_pkgname IN LISTS ARGS_ADD_REQUIREMENTS_OF)
-      if(${dep_pkgname}_${pkgname}_VERSION)
-        list(APPEND __required_versions__ ${${dep_pkgname}_${pkgname}_VERSION})
-      endif()
-      if(${dep_pkgname}_${pkgname}_COMPONENTS)
-        list(APPEND __components__ ${${dep_pkgname}_${pkgname}_COMPONENTS})
-      endif()
-    endforeach()
-  endif()
-
-  # select highest required version
-  unset(__version__)
-  if(__required_versions__)
-    list(GET __required_versions__ 0 __version__)
-    foreach(v IN LISTS __required_versions__)
-      if(${v} VERSION_GREATER ${__version__})
-        set(__version__ ${v})
-      endif()
-    endforeach()
-  endif()
-  # deduplicate required component list
-  if(__components__)
-    list(REMOVE_DUPLICATES ARGS_COMPONENTS)
-  endif()
-
-  # call native find_package
-  if(__components__)
-    find_package(${pkgname} ${__version__} QUIET COMPONENTS ${__components__} ${ARGS_UNPARSED_ARGUMENTS})
-  else()
-    find_package(${pkgname} ${__version__} QUIET ${ARGS_UNPARSED_ARGUMENTS})
-  endif()
-
-  if(${pkgname}_FOUND)
-    if(${qualifier} STREQUAL PRIVATE)
-      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-    elseif(${qualifier} STREQUAL PUBLIC)
-      set(PROJECT_${pkgname}_VERSION ${__version__})
-      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
-      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
-    elseif(${qualifier} STREQUAL INTERFACE)
-      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
-      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
-      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
-    endif()
-  endif()
-
-  unset(__version__)
-  unset(__components__)
-  unset(__required_versions__)
-  set(CMAKE_PREFIX_PATH ${__old_cpp__})
-  unset(__old_cpp__)
-endmacro()
--- a/cmake/FairLoggerConfig.cmake.in
+++ b/cmake/FairLoggerConfig.cmake.in
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -15,8 +15,8 @@ set(@PROJECT_NAME@_GIT_DATE @PROJECT_GIT_DATE@)

 set_and_check(@PROJECT_NAME@_PREFIX @PACKAGE_CMAKE_INSTALL_PREFIX@)
 set(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@)
-set(@PROJECT_NAME@_INCDIR @PACKAGE_INSTALL_INCDIRS@)
-set(@PROJECT_NAME@_INCDIRS @PACKAGE_INSTALL_INCDIRS@)
+set(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@FAIRLOGGER_INSTALL_INCLUDE_DIRS@)
+set(@PROJECT_NAME@_INCDIRS @PACKAGE_CMAKE_INSTALL_PREFIX@/@FAIRLOGGER_INSTALL_INCLUDE_DIRS@)
 set_and_check(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@)

 set(@PROJECT_NAME@_CXX_STANDARD_REQUIRED @CMAKE_CXX_STANDARD_REQUIRED@)
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2018-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -94,22 +94,24 @@ macro(set_fairlogger_defaults)
  endif()

  # Handle C++ standard level
-  set(PROJECT_MIN_CXX_STANDARD 14)
-  if(CMAKE_CXX_STANDARD LESS PROJECT_MIN_CXX_STANDARD)
+  set(PROJECT_MIN_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  if(NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD ${PROJECT_MIN_CXX_STANDARD})
+  elseif(${CMAKE_CXX_STANDARD} LESS ${PROJECT_MIN_CXX_STANDARD})
    message(FATAL_ERROR "A minimum CMAKE_CXX_STANDARD of ${PROJECT_MIN_CXX_STANDARD} is required.")
  endif()
+  set(CMAKE_CXX_EXTENSIONS OFF)

  # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
-  if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
-    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-  endif()
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-  if(NOT DEFINED BUILD_SHARED_LIBS)
+  if(NOT BUILD_SHARED_LIBS)
    set(BUILD_SHARED_LIBS ON CACHE BOOL "Whether to build shared libraries or static archives")
  endif()

  # Set -fPIC as default for all library types
-  if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
+  if(NOT CMAKE_POSITION_INDEPENDENT_CODE)
    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  endif()

@@ -120,7 +122,6 @@ macro(set_fairlogger_defaults)
  set(PROJECT_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
  set(PROJECT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
  set(PROJECT_INSTALL_INCDIR ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME_LOWER})
-  set(PROJECT_INSTALL_BUNDLEDINCDIR ${PROJECT_INSTALL_INCDIR}/bundled)
  set(PROJECT_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER})

  # https://cmake.org/Wiki/CMake_RPATH_handling
@@ -128,13 +129,13 @@ macro(set_fairlogger_defaults)
  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}" isSystemDir)
  if("${isSystemDir}" STREQUAL "-1")
    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      list(APPEND CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
-      list(APPEND CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags")
-      list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
+      set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-new-dtags")
+      set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--enable-new-dtags")
+      set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-      list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
+      set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
    else()
-      list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
+      set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
    endif()
  endif()

@@ -226,13 +227,6 @@ macro(install_cmake_package)
    VERSION ${PROJECT_VERSION}
    COMPATIBILITY AnyNewerVersion
  )
-  unset(PACKAGE_INSTALL_INCDIRS)
-  list(APPEND PACKAGE_INSTALL_INCDIRS
-    \$\{PACKAGE_PREFIX_DIR\}/${CMAKE_INSTALL_INCLUDEDIR})
-  if(NOT USE_EXTERNAL_FMT)
-    list(APPEND PACKAGE_INSTALL_INCDIRS
-      \$\{PACKAGE_PREFIX_DIR\}/${PROJECT_INSTALL_BUNDLEDINCDIR})
-  endif()
  generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES}
  string(TOUPPER ${CMAKE_BUILD_TYPE} PROJECT_BUILD_TYPE_UPPER)
  set(PROJECT_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${PROJECT_BUILD_TYPE_UPPER}})
@@ -248,3 +242,98 @@ macro(install_cmake_package)
    DESTINATION ${PACKAGE_INSTALL_DESTINATION}
  )
 endmacro()
+
+#
+# find_package2(PRIVATE|PUBLIC|INTERFACE <pkgname>
+#               [VERSION <version>]
+#               [COMPONENTS <list of components>]
+#               [ADD_REQUIREMENTS_OF <list of dep_pgkname>]
+#               [any other option the native find_package supports]...)
+#
+# Wrapper around CMake's native find_package command to add some features and bookkeeping.
+#
+# The qualifier (PRIVATE|PUBLIC|INTERFACE) to the package to populate
+# the variables PROJECT_[INTERFACE]_<pkgname>_([VERSION]|[COMPONENTS]|PACKAGE_DEPENDENCIES)
+# accordingly. This bookkeeping information is used to print our dependency found summary
+# table and to generate a part of our CMake package.
+#
+# When a dependending package is listed with ADD_REQUIREMENTS_OF the variables
+# <dep_pkgname>_<pkgname>_VERSION|COMPONENTS are looked up to and added to the native
+# VERSION (selected highest version) and COMPONENTS (deduplicated) args.
+#
+# COMPONENTS and VERSION args are then just passed to the native find_package.
+#
+macro(find_package2 qualifier pkgname)
+  cmake_parse_arguments(ARGS "" "VERSION" "COMPONENTS;ADD_REQUIREMENTS_OF" ${ARGN})
+
+  string(TOUPPER ${pkgname} pkgname_upper)
+  set(__old_cpp__ ${CMAKE_PREFIX_PATH})
+  set(CMAKE_PREFIX_PATH ${${pkgname_upper}_ROOT} $ENV{${pkgname_upper}_ROOT} ${CMAKE_PREFIX_PATH})
+
+  # build lists of required versions and components
+  unset(__required_versions__)
+  unset(__components__)
+  if(ARGS_VERSION)
+    list(APPEND __required_versions__ ${ARGS_VERSION})
+  endif()
+  if(ARGS_COMPONENTS)
+    list(APPEND __components__ ${ARGS_COMPONENTS})
+  endif()
+  if(ARGS_ADD_REQUIREMENTS_OF)
+    foreach(dep_pkgname IN LISTS ARGS_ADD_REQUIREMENTS_OF)
+      if(${dep_pkgname}_${pkgname}_VERSION)
+        list(APPEND __required_versions__ ${${dep_pkgname}_${pkgname}_VERSION})
+      endif()
+      if(${dep_pkgname}_${pkgname}_COMPONENTS)
+        list(APPEND __components__ ${${dep_pkgname}_${pkgname}_COMPONENTS})
+      endif()
+    endforeach()
+  endif()
+
+  # select highest required version
+  unset(__version__)
+  if(__required_versions__)
+    list(GET __required_versions__ 0 __version__)
+    foreach(v IN LISTS __required_versions__)
+      if(${v} VERSION_GREATER ${__version__})
+        set(__version__ ${v})
+      endif()
+    endforeach()
+  endif()
+  # deduplicate required component list
+  if(__components__)
+    list(REMOVE_DUPLICATES ARGS_COMPONENTS)
+  endif()
+
+  # call native find_package
+  if(__components__)
+    find_package(${pkgname} ${__version__} QUIET COMPONENTS ${__components__} ${ARGS_UNPARSED_ARGUMENTS})
+  else()
+    find_package(${pkgname} ${__version__} QUIET ${ARGS_UNPARSED_ARGUMENTS})
+  endif()
+
+  if(${pkgname}_FOUND)
+    if(${qualifier} STREQUAL PRIVATE)
+      set(PROJECT_${pkgname}_VERSION ${__version__})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
+    elseif(${qualifier} STREQUAL PUBLIC)
+      set(PROJECT_${pkgname}_VERSION ${__version__})
+      set(PROJECT_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_PACKAGE_DEPENDENCIES ${PROJECT_PACKAGE_DEPENDENCIES} ${pkgname})
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+    elseif(${qualifier} STREQUAL INTERFACE)
+      set(PROJECT_INTERFACE_${pkgname}_VERSION ${__version__})
+      set(PROJECT_INTERFACE_${pkgname}_COMPONENTS ${ARGS_COMPONENTS})
+      set(PROJECT_INTERFACE_PACKAGE_DEPENDENCIES ${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES} ${pkgname})
+    endif()
+  endif()
+
+  unset(__version__)
+  unset(__components__)
+  unset(__required_versions__)
+  set(CMAKE_PREFIX_PATH ${__old_cpp__})
+  unset(__old_cpp__)
+endmacro()
--- a/logger/Logger.cxx
+++ b/logger/Logger.cxx
@@ -63,35 +63,33 @@ const unordered_map<string, Verbosity> Logger::fVerbosityMap =

 const unordered_map<string, Severity> Logger::fSeverityMap =
 {
-    { "nolog",     Severity::nolog     },
-    { "NOLOG",     Severity::nolog     },
-    { "error",     Severity::error     },
-    { "ERROR",     Severity::error     },
-    { "alarm",     Severity::alarm     },
-    { "important", Severity::important },
-    { "warn",      Severity::warn      },
-    { "WARN",      Severity::warn      },
-    { "warning",   Severity::warn      },
-    { "WARNING",   Severity::warn      },
-    { "state",     Severity::state     },
-    { "STATE",     Severity::state     },
-    { "info",      Severity::info      },
-    { "INFO",      Severity::info      },
-    { "debug",     Severity::debug     },
-    { "DEBUG",     Severity::debug     },
-    { "debug1",    Severity::debug1    },
-    { "DEBUG1",    Severity::debug1    },
-    { "debug2",    Severity::debug2    },
-    { "DEBUG2",    Severity::debug2    },
-    { "debug3",    Severity::debug3    },
-    { "DEBUG3",    Severity::debug3    },
-    { "debug4",    Severity::debug4    },
-    { "DEBUG4",    Severity::debug4    },
-    { "trace",     Severity::trace     },
-    { "TRACE",     Severity::trace     }
+    { "nolog",   Severity::nolog  },
+    { "NOLOG",   Severity::nolog  },
+    { "error",   Severity::error  },
+    { "ERROR",   Severity::error  },
+    { "warn",    Severity::warn   },
+    { "WARN",    Severity::warn   },
+    { "warning", Severity::warn   },
+    { "WARNING", Severity::warn   },
+    { "state",   Severity::state  },
+    { "STATE",   Severity::state  },
+    { "info",    Severity::info   },
+    { "INFO",    Severity::info   },
+    { "debug",   Severity::debug  },
+    { "DEBUG",   Severity::debug  },
+    { "debug1",  Severity::debug1 },
+    { "DEBUG1",  Severity::debug1 },
+    { "debug2",  Severity::debug2 },
+    { "DEBUG2",  Severity::debug2 },
+    { "debug3",  Severity::debug3 },
+    { "DEBUG3",  Severity::debug3 },
+    { "debug4",  Severity::debug4 },
+    { "DEBUG4",  Severity::debug4 },
+    { "trace",   Severity::trace  },
+    { "TRACE",   Severity::trace  }
 };

-const array<string, 14> Logger::fSeverityNames =
+const array<string, 12> Logger::fSeverityNames =
 {
    {
        "NOLOG",
@@ -104,8 +102,6 @@ const array<string, 14> Logger::fSeverityNames =
        "INFO",
        "STATE",
        "WARN",
-        "IMPORTANT",
-        "ALARM",
        "ERROR",
        "FATAL"
    }
@@ -282,21 +278,19 @@ void Logger::LogEmptyLine()
 string Logger::GetColoredSeverityString(Severity severity)
 {
    switch (severity) {
-        case Severity::nolog:     return "\033[01;39mNOLOG\033[0m";     break;
-        case Severity::fatal:     return "\033[01;31mFATAL\033[0m";     break;
-        case Severity::error:     return "\033[01;31mERROR\033[0m";     break;
-        case Severity::alarm:     return "\033[01;33mALARM\033[0m";     break;
-        case Severity::important: return "\033[01;32mIMPORTANT\033[0m"; break;
-        case Severity::warn:      return "\033[01;33mWARN\033[0m";      break;
-        case Severity::state:     return "\033[01;35mSTATE\033[0m";     break;
-        case Severity::info:      return "\033[01;32mINFO\033[0m";      break;
-        case Severity::debug:     return "\033[01;34mDEBUG\033[0m";     break;
-        case Severity::debug1:    return "\033[01;34mDEBUG1\033[0m";    break;
-        case Severity::debug2:    return "\033[01;34mDEBUG2\033[0m";    break;
-        case Severity::debug3:    return "\033[01;34mDEBUG3\033[0m";    break;
-        case Severity::debug4:    return "\033[01;34mDEBUG4\033[0m";    break;
-        case Severity::trace:     return "\033[01;36mTRACE\033[0m";     break;
-        default:                  return "UNKNOWN";                     break;
+        case Severity::nolog:  return "\033[01;39mNOLOG\033[0m";  break;
+        case Severity::fatal:  return "\033[01;31mFATAL\033[0m";  break;
+        case Severity::error:  return "\033[01;31mERROR\033[0m";  break;
+        case Severity::warn:   return "\033[01;33mWARN\033[0m";   break;
+        case Severity::state:  return "\033[01;35mSTATE\033[0m";  break;
+        case Severity::info:   return "\033[01;32mINFO\033[0m";   break;
+        case Severity::debug:  return "\033[01;34mDEBUG\033[0m";  break;
+        case Severity::debug1: return "\033[01;34mDEBUG1\033[0m"; break;
+        case Severity::debug2: return "\033[01;34mDEBUG2\033[0m"; break;
+        case Severity::debug3: return "\033[01;34mDEBUG3\033[0m"; break;
+        case Severity::debug4: return "\033[01;34mDEBUG4\033[0m"; break;
+        case Severity::trace:  return "\033[01;36mTRACE\033[0m";  break;
+        default:               return "UNKNOWN";                  break;
    }
 }

--- a/logger/Logger.h
+++ b/logger/Logger.h
@@ -61,26 +61,23 @@ enum class Severity : int
    info = 7,
    state = 8,
    warn = 9,
-    important = 10,
-    alarm = 11,
-    error = 12,
-    fatal = 13,
-    // aliases
+    error = 10,
+    fatal = 11,
+    // backwards-compatibility:
+    NOLOG = nolog,
+    TRACE = trace,
+    DEBUG4 = debug4,
+    DEBUG3 = debug3,
+    DEBUG2 = debug2,
+    DEBUG1 = debug1,
+    DEBUG = debug,
+    INFO = info,
+    STATE = state,
+    WARNING = warn,
    warning = warn,
-    // backwards-compatibility
-    NOLOG   [[deprecated("Use 'nolog' instead")]]   = nolog,
-    TRACE   [[deprecated("Use 'trace' instead")]]   = trace,
-    DEBUG4  [[deprecated("Use 'debug4' instead")]]  = debug4,
-    DEBUG3  [[deprecated("Use 'debug3' instead")]]  = debug3,
-    DEBUG2  [[deprecated("Use 'debug2' instead")]]  = debug2,
-    DEBUG1  [[deprecated("Use 'debug1' instead")]]  = debug1,
-    DEBUG   [[deprecated("Use 'debug' instead")]]   = debug,
-    INFO    [[deprecated("Use 'info' instead")]]    = info,
-    STATE   [[deprecated("Use 'state' instead")]]   = state,
-    WARNING [[deprecated("Use 'warning' instead")]] = warn,
-    WARN    [[deprecated("Use 'warn' instead")]]    = warn,
-    ERROR   [[deprecated("Use 'error' instead")]]   = error,
-    FATAL   [[deprecated("Use 'fatal' instead")]]   = fatal
+    WARN = warn,
+    ERROR = error,
+    FATAL = fatal
 };

 // verbosity levels:
@@ -322,7 +319,7 @@ class Logger

    static const std::unordered_map<std::string, Verbosity> fVerbosityMap;
    static const std::unordered_map<std::string, Severity> fSeverityMap;
-    static const std::array<std::string, 14> fSeverityNames;
+    static const std::array<std::string, 12> fSeverityNames;
    static const std::array<std::string, 9> fVerbosityNames;

    // protection for use after static destruction took place
--- a/test/ci/CMakeLists.txt
+++ b/test/ci/CMakeLists.txt
@@ -1,36 +0,0 @@
-################################################################################
-#   Copyright (C) 2021 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"                       #
-################################################################################
-
-function(container)
-  cmake_parse_arguments(ARGS "" "OS;VERSION" "" ${ARGN})
-
-  set(container "${ARGS_OS}.${ARGS_VERSION}")
-  set(def "${container}.def")
-  set(log "${container}.log")
-  set(target "${container}.sif")
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/linux.def.in" ${def} @ONLY)
-
-  add_custom_command(OUTPUT ${target}
-    COMMAND ${CMAKE_COMMAND} -E env ${BASH} -c
-      "${SINGULARITY} build -f -F ${target} ${def} > ${log} 2>&1"
-    VERBATIM
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Building fairlogger test container ${target}, logging to ${CMAKE_CURRENT_BINARY_DIR}/${log}"
-    DEPENDS ${PACKAGE_SETUP_SCRIPT} ${bootstrap_cmake_script}
-  )
-
-  list(APPEND containers ${target})
-  set(containers ${containers} PARENT_SCOPE)
-endfunction()
-
-container(OS fedora VERSION 32)
-container(OS fedora VERSION 33)
-container(OS fedora VERSION 34)
-
-add_custom_target(all-containers DEPENDS ${containers})
--- a/test/ci/linux.def.in
+++ b/test/ci/linux.def.in
@@ -1,8 +0,0 @@
-Bootstrap: docker
-From: @ARGS_OS@:@ARGS_VERSION@
-
-%files
-    @CMAKE_CURRENT_SOURCE_DIR@/setup-@ARGS_OS@.sh /setup.sh
-
-%post
-    bash /setup.sh @ARGS_VERSION@
--- a/test/ci/setup-fedora.sh
+++ b/test/ci/setup-fedora.sh
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-dnf -y update
-dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-$1-x86_64/fairsoft-release-dev.rpm
-dnf -y install boost-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra
-dnf -y builddep fairlogger
-dnf -y clean all
--- a/test/ci/slurm-submit.sh
+++ b/test/ci/slurm-submit.sh
@@ -1,35 +0,0 @@
-#! /bin/bash
-
-label="$1"
-jobsh="$2"
-
-ALFACI_SLURM_CPUS=4
-if [ -z "$ALFACI_SLURM_EXTRA_OPTS" ]
-then
-	ALFACI_SLURM_EXTRA_OPTS="--hint=compute_bound"
-fi
-ALFACI_SLURM_TIMEOUT=10
-if [ -z "$ALFACI_SLURM_QUEUE" ]
-then
-	ALFACI_SLURM_QUEUE=main
-fi
-
-echo "*** Slurm request options :"
-echo "***   Working directory ..: $PWD"
-echo "***   Queue ..............: $ALFACI_SLURM_QUEUE"
-echo "***   CPUs ...............: $ALFACI_SLURM_CPUS"
-echo "***   Wall Time ..........: $ALFACI_SLURM_TIMEOUT min"
-echo "***   Job Name ...........: ${label}"
-echo "***   Extra Options ......: ${ALFACI_SLURM_EXTRA_OPTS}"
-echo "*** Submitting job at ....: $(date -R)"
-(
-	set -x
-	srun -p $ALFACI_SLURM_QUEUE -c $ALFACI_SLURM_CPUS -n 1 \
-		-t $ALFACI_SLURM_TIMEOUT \
-		--job-name="${label}" \
-		${ALFACI_SLURM_EXTRA_OPTS} \
-		bash "${jobsh}"
-)
-retval=$?
-echo "*** Exit Code ............: $retval"
-exit "$retval"
--- a/test/cycle.cxx
+++ b/test/cycle.cxx
@@ -38,7 +38,7 @@ int main()
        Logger::SetConsoleSeverity(Severity::fatal);
        cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;

-        array<Severity, 14> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::info, Severity::state, Severity::warn, Severity::important, Severity::alarm, Severity::error, Severity::fatal }};
+        array<Severity, 12> severitiesUp{{ Severity::nolog, Severity::trace, Severity::debug4, Severity::debug3, Severity::debug2, Severity::debug1, Severity::debug, Severity::info, Severity::state, Severity::warn, Severity::error, Severity::fatal }};
 #ifdef FAIR_MIN_SEVERITY
        for (unsigned int i = static_cast<int>(Severity::FAIR_MIN_SEVERITY); i < severitiesUp.size(); ++i) {
 #else
@@ -57,7 +57,7 @@ int main()
        Logger::SetConsoleSeverity(Severity::fatal);
        cout << "initial severity >" << Logger::GetConsoleSeverity() << "<" << endl << endl;

-        array<Severity, 14> severitiesDown{{ Severity::error, Severity::alarm, Severity::important, Severity::warn, Severity::state, Severity::info, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
+        array<Severity, 12> severitiesDown{{ Severity::error, Severity::warn, Severity::state, Severity::info, Severity::debug, Severity::debug1, Severity::debug2, Severity::debug3, Severity::debug4, Severity::trace, Severity::nolog, Severity::fatal }};
 #ifdef FAIR_MIN_SEVERITY
        for (unsigned int i = 0; i < severitiesDown.size() - static_cast<int>(Severity::FAIR_MIN_SEVERITY) - 1; ++i) {
 #else
--- a/test/logger.cxx
+++ b/test/logger.cxx
@@ -17,20 +17,18 @@ void printEverySeverity()
 {
    static int i = 1;

-    LOG(nolog)     << "nolog message, counter: "     << i++;
-    LOG(trace)     << "trace message, counter: "     << i++;
-    LOG(debug4)    << "debug4 message, counter: "    << i++;
-    LOG(debug3)    << "debug3 message, counter: "    << i++;
-    LOG(debug2)    << "debug2 message, counter: "    << i++;
-    LOG(debug1)    << "debug1 message, counter: "    << i++;
-    LOG(debug)     << "debug message, counter: "     << i++;
-    LOG(info)      << "info message, counter: "      << i++;
-    LOG(state)     << "state message, counter: "     << i++;
-    LOG(warn)      << "warning message, counter: "   << i++;
-    LOG(important) << "important message, counter: " << i++;
-    LOG(alarm)     << "alarm message, counter: "     << i++;
-    LOG(error)     << "error message, counter: "     << i++;
-    LOG(fatal)     << "fatal message, counter: "     << i++;
+    LOG(nolog)  << "nolog message, counter: "   << i++;
+    LOG(trace)  << "trace message, counter: "   << i++;
+    LOG(debug4) << "debug4 message, counter: "  << i++;
+    LOG(debug3) << "debug3 message, counter: "  << i++;
+    LOG(debug2) << "debug2 message, counter: "  << i++;
+    LOG(debug1) << "debug1 message, counter: "  << i++;
+    LOG(debug)  << "debug message, counter: "   << i++;
+    LOG(info)   << "info message, counter: "    << i++;
+    LOG(state)  << "state message, counter: "   << i++;
+    LOG(warn)   << "warning message, counter: " << i++;
+    LOG(error)  << "error message, counter: "   << i++;
+    LOG(fatal)  << "fatal message, counter: "   << i++;
 }

 void printAllVerbositiesWithSeverity(Severity sev)
--- a/test/nolog.cxx
+++ b/test/nolog.cxx
@@ -13,19 +13,17 @@ using namespace fair;

 void printEverySeverity()
 {
-    LOG(nolog)     << "nolog message, counter: ";
-    LOG(trace)     << "trace message, counter: ";
-    LOG(debug4)    << "debug4 message, counter: ";
-    LOG(debug3)    << "debug3 message, counter: ";
-    LOG(debug2)    << "debug2 message, counter: ";
-    LOG(debug1)    << "debug1 message, counter: ";
-    LOG(debug)     << "debug message, counter: ";
-    LOG(info)      << "info message, counter: ";
-    LOG(state)     << "state message, counter: ";
-    LOG(warn)      << "warning message, counter: ";
-    LOG(important) << "important message, counter: ";
-    LOG(alarm)     << "alarm message, counter: ";
-    LOG(error)     << "error message, counter: ";
+    LOG(nolog)  << "nolog message, counter: ";
+    LOG(trace)  << "trace message, counter: ";
+    LOG(debug4) << "debug4 message, counter: ";
+    LOG(debug3) << "debug3 message, counter: ";
+    LOG(debug2) << "debug2 message, counter: ";
+    LOG(debug1) << "debug1 message, counter: ";
+    LOG(debug)  << "debug message, counter: ";
+    LOG(info)   << "info message, counter: " ;
+    LOG(state)  << "state message, counter: ";
+    LOG(warn)   << "warning message, counter: ";
+    LOG(error)  << "error message, counter: ";
 }

 void silentlyPrintAllVerbositiesWithSeverity(Severity sev)
--- a/test/severity.cxx
+++ b/test/severity.cxx
@@ -20,20 +20,18 @@ using namespace fair::logger::test;

 uint32_t printEverySeverity(uint32_t i)
 {
-    LOG(nolog)     << "nolog message, counter: "     << i++;
-    LOG(trace)     << "trace message, counter: "     << i++;
-    LOG(debug4)    << "debug4 message, counter: "    << i++;
-    LOG(debug3)    << "debug3 message, counter: "    << i++;
-    LOG(debug2)    << "debug2 message, counter: "    << i++;
-    LOG(debug1)    << "debug1 message, counter: "    << i++;
-    LOG(debug)     << "debug message, counter: "     << i++;
-    LOG(info)      << "info message, counter: "      << i++;
-    LOG(state)     << "state message, counter: "     << i++;
-    LOG(warn)      << "warning message, counter: "   << i++;
-    LOG(important) << "important message, counter: " << i++;
-    LOG(alarm)     << "alarm message, counter: "     << i++;
-    LOG(error)     << "error message, counter: "     << i++;
-    LOG(fatal)     << "fatal message, counter: "     << i++;
+    LOG(nolog)  << "nolog message, counter: "   << i++;
+    LOG(trace)  << "trace message, counter: "   << i++;
+    LOG(debug4) << "debug4 message, counter: "  << i++;
+    LOG(debug3) << "debug3 message, counter: "  << i++;
+    LOG(debug2) << "debug2 message, counter: "  << i++;
+    LOG(debug1) << "debug1 message, counter: "  << i++;
+    LOG(debug)  << "debug message, counter: "   << i++;
+    LOG(info)   << "info message, counter: "    << i++;
+    LOG(state)  << "state message, counter: "   << i++;
+    LOG(warn)   << "warning message, counter: " << i++;
+    LOG(error)  << "error message, counter: "   << i++;
+    LOG(fatal)  << "fatal message, counter: "   << i++;

    return i;
 }
@@ -47,7 +45,7 @@ void CheckSeverity(Severity severity)

    for (uint32_t i = 0; i < Logger::fSeverityNames.size(); ++i) {
        if (sev == Severity::nolog) {
-            if (i == static_cast<int>(fair::Severity::fatal)) {
+            if (i == 11) {
                if (!Logger::Logging(static_cast<Severity>(i))) {
                    throw runtime_error(ToStr("expecting to be logging ", Logger::fSeverityNames.at(i), " during ", sev, ", but it is not."));
                }