mirror of
https://github.com/FairRootGroup/FairLogger.git
synced 2025-10-19 19:41:45 +00:00
Compare commits
4 Commits
v1.11.0
...
fix-cmake-
Author | SHA1 | Date | |
---|---|---|---|
|
efa951f1ab | ||
|
56b90a7445 | ||
|
7fc05f3808 | ||
|
d93fb0870b |
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -62,8 +62,8 @@ pipeline{
|
|||||||
[os: 'fedora', ver: '32', arch: 'x86_64', compiler: 'gcc-10'],
|
[os: 'fedora', ver: '32', arch: 'x86_64', compiler: 'gcc-10'],
|
||||||
[os: 'fedora', ver: '33', 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: 'fedora', ver: '34', arch: 'x86_64', compiler: 'gcc-11'],
|
||||||
[os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12'],
|
[os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-13'],
|
||||||
[os: 'macos', ver: '11', arch: 'arm64', compiler: 'apple-clang-13'],
|
[os: 'macos', ver: '12', arch: 'arm64', compiler: 'apple-clang-13'],
|
||||||
])
|
])
|
||||||
|
|
||||||
parallel(builds)
|
parallel(builds)
|
||||||
|
@@ -128,8 +128,8 @@ macro(set_fairlogger_defaults)
|
|||||||
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}" isSystemDir)
|
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}" isSystemDir)
|
||||||
if("${isSystemDir}" STREQUAL "-1")
|
if("${isSystemDir}" STREQUAL "-1")
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||||
list(APPEND CMAKE_EXE_LINKER_FLAGS "-Wl,--enable-new-dtags")
|
string(APPEND CMAKE_EXE_LINKER_FLAGS " -Wl,--enable-new-dtags")
|
||||||
list(APPEND CMAKE_SHARED_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}")
|
list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
|
||||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
|
list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
|
||||||
|
@@ -66,6 +66,8 @@ const unordered_map<string, Severity> Logger::fSeverityMap =
|
|||||||
{
|
{
|
||||||
{ "nolog", Severity::nolog },
|
{ "nolog", Severity::nolog },
|
||||||
{ "NOLOG", Severity::nolog },
|
{ "NOLOG", Severity::nolog },
|
||||||
|
{ "fatal", Severity::fatal },
|
||||||
|
{ "FATAL", Severity::fatal },
|
||||||
{ "error", Severity::error },
|
{ "error", Severity::error },
|
||||||
{ "ERROR", Severity::error },
|
{ "ERROR", Severity::error },
|
||||||
{ "alarm", Severity::alarm },
|
{ "alarm", Severity::alarm },
|
||||||
|
Reference in New Issue
Block a user