[glog] Avoid including Windows.h (#24538)

* Fix building errors of glog * Bump the port version of glog * Update version database * Fix building errors * Update version database
microsoft · Jun 6, 2022 · fdeea72 · fdeea72
1 parent 904a51f
commit fdeea72
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 62 deletions.
diff --git a/ports/glog/fix-windows-CXX11_ATOMIC.patch b/ports/glog/fix-windows-CXX11_ATOMIC.patch
@@ -0,0 +1,17 @@
+diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
+index 3ecacfb..2d48a0e 100644
+--- a/src/glog/logging.h.in
++++ b/src/glog/logging.h.in
+@@ -100,6 +100,12 @@
+ #include <gflags/gflags.h>
+ #endif
+
++#ifdef GLOG_OS_WINDOWS
++#ifndef HAVE_CXX11_ATOMIC
++#define HAVE_CXX11_ATOMIC
++#endif
++#endif
++
+ #ifdef HAVE_CXX11_ATOMIC
+ #include <atomic>
+ #elif defined(GLOG_OS_WINDOWS)
diff --git a/ports/glog/nogdi-nominmax.patch b/ports/glog/nogdi-nominmax.patch
diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
        glog_disable_debug_postfix.patch
        fix_glog_CMAKE_MODULE_PATH.patch
        fix_log_every_n.patch
-       nogdi-nominmax.patch
+       fix-windows-CXX11_ATOMIC.patch
        fix_crosscompile_symbolize.patch
 
 )

diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "glog",
   "version": "0.5.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "C++ implementation of the Google logging module",
   "homepage": "https://github.com/google/glog",
   "license": "BSD-3-Clause",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2570,7 +2570,7 @@
     },
     "glog": {
       "baseline": "0.5.0",
-      "port-version": 3
+      "port-version": 4
     },
     "gloo": {
       "baseline": "20201203",

diff --git a/versions/g-/glog.json b/versions/g-/glog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b",
+      "version": "0.5.0",
+      "port-version": 4
+    },
     {
       "git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8",
       "version": "0.5.0",