Skip to content

Commit fce771c

Browse files
committed
Solaris fixes for new spdlog regression
1 parent 2b0fb4b commit fce771c

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

cmake/dependencies.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ fetch_dependency(fmt)
112112
set(SPDLOG_NO_ATOMIC_LEVELS ON CACHE BOOL "prevent spdlog from using of std::atomic log levels (use only if your code never modifies log levels concurrently)")
113113
set(SPDLOG_NO_TLS ON CACHE BOOL "prevent spdlog from using thread local storage")
114114
set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "Use external fmt library instead of bundled")
115+
if (NOT HAVE_TM_TM_GMTOFF)
116+
set(SPDLOG_NO_TZ_OFFSET ON CACHE BOOL "Omit %z timezone offset (use on platforms without tm_gmtoff)")
117+
endif()
115118
fetch_dependency(spdlog)
116119

117120
fetch_dependency(tomlplusplus)

cmake/detect_system.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ if (NOT HAVE_NETLINK)
6262
endif()
6363

6464
check_struct_has_member("struct sockaddr" "sa_len" "sys/types.h;sys/socket.h" HAVE_SOCKADDR_SA_LEN)
65+
check_struct_has_member("struct tm" "tm_gmtoff" "time.h" HAVE_TM_TM_GMTOFF)
66+
6567

6668
check_include_files(execinfo.h HAVE_EXECINFO_H)
6769
check_library_exists(execinfo backtrace "" HAVE_EXECINFO_LIB)

0 commit comments

Comments
 (0)