luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #635 from google/win-headers

Browse Source 
Use generated config.h for Windows.
This commit is contained in:
Sergiu Deitsch 2021-04-06 20:15:32 +02:00 committed by GitHub
commit 36e6ed910a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bazel/glog.bzl
View File

@ -111,6 +111,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
name = "glog", name = "glog",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
srcs = [ srcs = [
":config_h",
"src/base/commandlineflags.h", "src/base/commandlineflags.h",
"src/base/googleinit.h", "src/base/googleinit.h",
"src/base/mutex.h", "src/base/mutex.h",
@ -133,7 +134,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
"src/vlog_is_on.cc", "src/vlog_is_on.cc",
] + select({ ] + select({
"@bazel_tools//src/conditions:windows": windows_only_srcs, "@bazel_tools//src/conditions:windows": windows_only_srcs,
"//conditions:default": [":config_h"], "//conditions:default": [],
}), }),
hdrs = [ hdrs = [
"src/glog/log_severity.h", "src/glog/log_severity.h",
@ -144,8 +145,8 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
], ],
strip_include_prefix = "src", strip_include_prefix = "src",
defines = select({ defines = select({
# We need to override the default GOOGLE_GLOG_DLL_DECL from # GOOGLE_GLOG_DLL_DECL is normally set by export.h, but that's not
# src/glog/*.h to match src/windows/config.h. # generated for Bazel.
"@bazel_tools//src/conditions:windows": ["GOOGLE_GLOG_DLL_DECL=__declspec(dllexport)"], "@bazel_tools//src/conditions:windows": ["GOOGLE_GLOG_DLL_DECL=__declspec(dllexport)"],
"//conditions:default": [], "//conditions:default": [],
}), }),