Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glog] update to v0.5 #22135

Merged
merged 62 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
8add833
[abseil] Upgrade to 2021.1102
jiayuehua Dec 14, 2021
d7902b9
revert portfile.cmake
JonLiu1993 Dec 16, 2021
b8c364a
update version
JonLiu1993 Dec 16, 2021
f27bc3c
update portfile.cmake
JonLiu1993 Dec 16, 2021
1ac8147
update version
JonLiu1993 Dec 16, 2021
fc96e70
[s2geometry] google s2 for for manipulating geometric shapes
jiayuehua Dec 14, 2021
757a375
[libevent] no absolute paths (#21179)
autoantwort Dec 14, 2021
b54d601
[Pcre2] Check if files exists before call vcpkg_replace_string. (#22003)
larshg Dec 14, 2021
8b8eb17
[lodepng] Fix cannot open include file "lodepng.h" (#22007)
LilyWangLL Dec 14, 2021
ef56f7d
[MyGUI] update to 3.4.1 (#22015)
FrankXie05 Dec 14, 2021
64672b7
[s2n] Update, add openssl dependency (#21484)
dg0yt Dec 14, 2021
34f4281
Libpq update and VCPKG_OSX_SYSROOT fix (#21583)
daschuer Dec 14, 2021
fab1111
[qhttpengine] New port (#22009)
kafeg Dec 14, 2021
a19bedd
[ xtensor-io ] Fix wrong hash (#22018)
JonLiu1993 Dec 14, 2021
1a0a2fe
[vcpkg] Update VMs for December 2021 Patch Tuesday (#22013)
BillyONeal Dec 15, 2021
bfb9db9
[starlink] Veggiesaurus/starlink ast cminpack fix (#20559)
veggiesaurus Dec 15, 2021
1bec8e8
[libunifex] Update to 2021-12-07 (#21995)
zeyangl Dec 15, 2021
9227e3e
[tensorflow] update to 2.7, including bazel latest 4.x update (#22022)
jgehw Dec 15, 2021
38f7c8e
[hiredis] Fix static build (#22038)
kafeg Dec 15, 2021
608d912
[vcpkg baseline] Fix mpg123 build failed on Linux (#22028)
LilyWangLL Dec 16, 2021
83c0859
[qt5-base] no _debug lib suffixes on macOS (#14225) (#21695)
autoantwort Dec 16, 2021
f8992fb
[python3] Support arm (#21528)
NancyLi1013 Dec 17, 2021
b84c9fc
[openmvg] update to 2.0 (#22020)
FrankXie05 Dec 17, 2021
2e46c24
[brynet] Update to 1.11.1 (#22021)
IronsDu Dec 17, 2021
91d0eea
[graphicsmagick] update to version 1.3.37 (#22024)
josuegomes Dec 17, 2021
6bc621a
[meson] fix windows linker detection (#22032)
Neumann-A Dec 17, 2021
df7ead3
[libgpg-error] Release-only build support (#22036)
kafeg Dec 17, 2021
9202ec0
[elfutils] provide static or shared libraries correctly (#22055)
csw Dec 17, 2021
87a780b
[gl3w] Use khrplatform.h from the egl-registry port (#22056)
cfillion Dec 17, 2021
a222dc6
[caf] Update to 0.18.5 (#22046)
PhoebeHui Dec 17, 2021
a941c14
[gmsh] Add new port (#21896)
xarthurx Dec 17, 2021
d416206
[kf5] upgrade to 5.89 (#21890)
wrobelda Dec 17, 2021
4f1784a
[ompl] Add vcpkg_check_linkage (#21659)
JackBoosY Dec 17, 2021
ba42f4c
[pcl] Add feature apps, visualization, simulation, examples and add u…
JackBoosY Dec 17, 2021
a32e324
[activemq-cpp] Added missing libuuid dependency (#22059)
daschuer Dec 17, 2021
503614c
[optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algo…
kafeg Dec 17, 2021
0ec3a89
[tensorflow-common] remove single quotes from vcpkg flags (#21869)
daschuer Dec 17, 2021
4112681
[sdl2-mixer] Fix link mpg123 error (#22049)
LilyWangLL Dec 17, 2021
e52f697
Merge branch 'microsoft:master' into master
jiayuehua Dec 20, 2021
20701cd
[glog]: update to v0.5
jiayuehua Dec 21, 2021
f1a981b
[glog]: update to v0.5
jiayuehua Dec 21, 2021
60a8e70
[glog]: update to v0.5.0
jiayuehua Dec 22, 2021
26bc31e
[glog] update to version 0.5
jiayuehua Dec 22, 2021
e2eb78c
[glog]: update to v0.5.0
jiayuehua Dec 23, 2021
8a8a8a5
[glog]: update to v0.5.0
jiayuehua Dec 24, 2021
d70ca71
[glog] : update to v0.5.0
jiayuehua Dec 28, 2021
965f871
[glog] update to v0.5.0
jiayuehua Dec 29, 2021
5e3e6d3
[glog] fix log_every_n
jiayuehua Mar 2, 2022
5562f6d
Merge remote-tracking branch 'upstream/master' into glog
jiayuehua Apr 6, 2022
eb5f213
[rsocket]:fix ERROR macro
jiayuehua Apr 6, 2022
6936e90
Merge branch 'master' of https://github.com/microsoft/vcpkg into glog
Apr 7, 2022
e9c3b01
add license
Apr 7, 2022
f0185d8
update version
Apr 7, 2022
8909c26
Revert "[rsocket]:fix ERROR macro"
jiayuehua Apr 7, 2022
b648927
[glog]: v0.5 nogdi macro
jiayuehua Apr 7, 2022
e21ff11
[glog]: remove IN OUT macro
jiayuehua Apr 8, 2022
f2d69d2
[glog] v0.5
jiayuehua Apr 8, 2022
68d260d
--amend
jiayuehua Apr 8, 2022
e1d2c00
[caffe2] undefinde IN OUT macro
jiayuehua Apr 8, 2022
6712fdd
[glog]: v0.5
jiayuehua Apr 8, 2022
d6f2714
Format portfile.cmake and add license
Apr 8, 2022
93d6c09
update version
Apr 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ports/caffe2/no-inout-macros.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h
index 2df4435..408bb4a 100644
--- a/caffe2/core/logging_is_google_glog.h
+++ b/caffe2/core/logging_is_google_glog.h
@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set)

#include <glog/logging.h>

+#ifdef IN
+#undef IN
+#endif
+
+#ifdef OUT
+#undef OUT
+#endif
+

#endif // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_
1 change: 1 addition & 0 deletions ports/caffe2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ vcpkg_from_github(
msvc-fixes.patch
fix-space.patch
fix-protobuf-deprecated.patch
no-inout-macros.patch
)

if(VCPKG_CRT_LINKAGE STREQUAL static)
Expand Down
4 changes: 2 additions & 2 deletions ports/caffe2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "caffe2",
"version-string": "0.8.1",
"port-version": 5,
"version": "0.8.1",
"port-version": 6,
"description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.",
"homepage": "https://github.com/caffe2/caffe2",
"supports": "!x86",
Expand Down
77 changes: 77 additions & 0 deletions ports/glog/fix_glog_CMAKE_MODULE_PATH.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e2688..cf87798 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -843,36 +843,6 @@ write_basic_package_version_file (
export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
export (PACKAGE glog)

-get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
-
-# Directory containing the find modules relative to the config install
-# directory.
-file (RELATIVE_PATH glog_REL_CMake_MODULES
- ${_PREFIX}/${_glog_CMake_INSTALLDIR}
- ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake)
-
-get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES}
- DIRECTORY)
-
-set (glog_FULL_CMake_DATADIR
- ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR})
-
-configure_file (glog-modules.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY)
-
-install (CODE
-"
-set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\")
-configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY)
-file (INSTALL
- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
- DESTINATION
- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\")
-"
- COMPONENT Development
-)
-
install (FILES
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
diff --git a/glog-config.cmake.in b/glog-config.cmake.in
index 5c5c9c0..31fac52 100644
--- a/glog-config.cmake.in
+++ b/glog-config.cmake.in
@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
@PACKAGE_INIT@

include (CMakeFindDependencyMacro)
-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake)

@gflags_DEPENDENCY@
@Unwind_DEPENDENCY@
diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in
deleted file mode 100644
index 71c5160..0000000
--- a/glog-modules.cmake.in
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_policy (PUSH)
-cmake_policy (SET CMP0057 NEW)
-
-if (CMAKE_VERSION VERSION_LESS 3.3)
- message (FATAL_ERROR "glog-modules.cmake requires the consumer "
- "to use CMake 3.3 (or newer)")
-endif (CMAKE_VERSION VERSION_LESS 3.3)
-
-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@")
-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH})
-
-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to "
- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at "
- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.")
-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
-
-cmake_policy (POP)
Loading