From ab5d1d2f74f2141e9c7c6635fddcfd7cc579a942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=85=E6=88=8E=E6=B0=8F?= Date: Sun, 25 Feb 2024 12:43:39 +0800 Subject: [PATCH] fix(glog): configure macros specify use glog as dll or lib --- CMakeLists.txt | 16 +++++++++++++--- src/rime/common.h | 1 - src/rime/setup.cc | 5 ++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d5fe024a..66322fe2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,9 +80,19 @@ if(ENABLE_LOGGING) find_package(Glog REQUIRED) if(Glog_FOUND) include_directories(${Glog_INCLUDE_PATH}) - endif() - if(Glog_STATIC) - add_definitions(-DGOOGLE_GLOG_DLL_DECL=) + if(WIN32) + add_compile_definitions("GLOG_DEPRECATED=__declspec(deprecated)") + add_compile_definitions(GLOG_NO_ABBREVIATED_SEVERITIES) + else() + add_compile_definitions("GLOG_DEPRECATED=__attribute__((deprecated))") + endif() + if(Glog_STATIC) + add_compile_definitions(GLOG_EXPORT=) + add_compile_definitions(GLOG_NO_EXPORT=) + else() + add_compile_definitions("GLOG_EXPORT=__attribute__((visibility(\"default\")))") + add_compile_definitions("GLOG_NO_EXPORT=__attribute__((visibility(\"default\")))") + endif() endif() set(RIME_ENABLE_LOGGING 1) diff --git a/src/rime/common.h b/src/rime/common.h index 5de23b876..9b937b073 100644 --- a/src/rime/common.h +++ b/src/rime/common.h @@ -26,7 +26,6 @@ #include #ifdef RIME_ENABLE_LOGGING -#define GLOG_NO_ABBREVIATED_SEVERITIES #include #else #include "no_logging.h" diff --git a/src/rime/setup.cc b/src/rime/setup.cc index a09c46495..760088cd6 100644 --- a/src/rime/setup.cc +++ b/src/rime/setup.cc @@ -8,10 +8,9 @@ #include #ifdef RIME_ENABLE_LOGGING -#ifdef _WIN32 -#define GLOG_NO_ABBREVIATED_SEVERITIES -#endif // _WIN32 #include +#else +#include "no_logging.h" #endif // RIME_ENABLE_LOGGING #include