Avoid semicolon insertion when modifying linker flags

Avoid "Unknown severity" message also for uppercase fatal
Avoid "Unknown severity" message for fatal
2025-10-17 18:41:45 +00:00 · 2024-02-16 17:25:06 +01:00 · 2022-06-28 11:23:57 +02:00 · 2022-06-28 11:23:57 +02:00 · 2022-04-17 06:10:15 +02:00
3 changed files with 6 additions and 4 deletions
--- a/4
+++ b/4
@@ -62,8 +62,8 @@ pipeline{
            [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'],
-            [os: 'macos',  ver: '11',    arch: 'arm64',  compiler: 'apple-clang-13'],
+            [os: 'macos',  ver: '12',    arch: 'x86_64', compiler: 'apple-clang-13'],
+            [os: 'macos',  ver: '12',    arch: 'arm64',  compiler: 'apple-clang-13'],
          ])

          parallel(builds)
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -128,8 +128,8 @@ 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")
+      string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
+      string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,--enable-new-dtags")
      list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
      list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
--- a/logger/Logger.cxx
+++ b/logger/Logger.cxx
@@ -66,6 +66,8 @@ const unordered_map<string, Severity> Logger::fSeverityMap =
 {
    { "nolog",     Severity::nolog     },
    { "NOLOG",     Severity::nolog     },
+    { "fatal",     Severity::fatal     },
+    { "FATAL",     Severity::fatal     },
    { "error",     Severity::error     },
    { "ERROR",     Severity::error     },
    { "alarm",     Severity::alarm     },
Author	SHA1	Message	Date
Alexey Rybalchenko	efa951f1ab	Avoid semicolon insertion when modifying linker flags	2024-02-16 17:25:06 +01:00
Alexey Rybalchenko	56b90a7445	Avoid "Unknown severity" message also for uppercase fatal	2022-06-28 11:23:57 +02:00
Giulio Eulisse	7fc05f3808	Avoid "Unknown severity" message for fatal	2022-06-28 11:23:57 +02:00
Dennis Klein	d93fb0870b	ci: Update macOS builds	2022-04-17 06:10:15 +02:00