simplified definitions

google · Apr 11, 2021 · 86b51fd · 86b51fd
1 parent 528fcca
commit 86b51fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -583,11 +583,9 @@ endif (HAVE_PTHREAD)
 if (gflags_FOUND)
   target_link_libraries (glog PUBLIC gflags)
 
-  target_compile_definitions (glog
-    PRIVATE GFLAGS_DLL_DECLARE_FLAG=GOOGLE_GLOG_DLL_DECL
-    PRIVATE GFLAGS_DLL_DEFINE_FLAG=GOOGLE_GLOG_DLL_DECL
-    PUBLIC "$<BUILD_INTERFACE:GFLAGS_DLL_DECLARE_FLAG=GOOGLE_GLOG_DLL_DECL>"
-    PUBLIC "$<BUILD_INTERFACE:GFLAGS_DLL_DEFINE_FLAG=GOOGLE_GLOG_DLL_DECL>"
+  target_compile_definitions (glog PRIVATE
+    GFLAGS_DLL_DECLARE_FLAG=GOOGLE_GLOG_DLL_DECL
+    GFLAGS_DLL_DEFINE_FLAG=GOOGLE_GLOG_DLL_DECL
   )
 endif (gflags_FOUND)
 

diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
@@ -87,7 +87,9 @@
 #endif
 
 #pragma push_macro("GFLAGS_DLL_DECLARE_FLAG")
+#ifdef GFLAGS_DLL_DECLARE_FLAG
 #undef GFLAGS_DLL_DECLARE_FLAG
+#endif // defined(GFLAGS_DLL_DECLARE_FLAG)
 #define GFLAGS_DLL_DECLARE_FLAG GOOGLE_GLOG_DLL_DECL
 
 #if @ac_cv_have_libgflags@