diff --git a/ports/glog/fix_cplusplus_macro.patch b/ports/glog/fix_cplusplus_macro.patch deleted file mode 100644 index bd9d0e111a7983..00000000000000 --- a/ports/glog/fix_cplusplus_macro.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 985f5f5..bf6600e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -476,6 +476,10 @@ if (CYGWIN OR WIN32) - target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) - endif (CYGWIN OR WIN32) - -+if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914)) -+ target_compile_options(glog INTERFACE "$<$>:/Zc:__cplusplus>") -+endif() -+ - set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") - - target_include_directories (glog BEFORE PUBLIC diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 76cd91e512e085..92f13d4acccd4b 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -8,7 +8,6 @@ vcpkg_from_github( fix_glog_CMAKE_MODULE_PATH.patch glog_disable_debug_postfix.patch fix_crosscompile_symbolize.patch - fix_cplusplus_macro.patch ) vcpkg_check_features( diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index da170c218d6028..9999ea5eeeb85a 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glog", "version": "0.7.1", + "port-version": 1, "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 index 3b89175c86b07f..cead76fc9dccdf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3422,7 +3422,7 @@ }, "glog": { "baseline": "0.7.1", - "port-version": 0 + "port-version": 1 }, "gloo": { "baseline": "20240626", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index e8aea69225842d..c60f9b52cc0413 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb5d2744754ff4d687c5dc984bb63ecf08eb3ca0", + "version": "0.7.1", + "port-version": 1 + }, { "git-tree": "da85ebb84a5ed38130c760c9d5f9b2d598b39e2e", "version": "0.7.1",