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.

Sign up for GitHub

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

Jump to bottom

[glog] Update to 0.5.0 #20840

Closed
wants to merge 2 commits into from
Closed

[glog] Update to 0.5.0 #20840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
516a5e3
[glog] Update to 0.5.0
Oct 19, 2021
9d58998
Format manifest
Oct 19, 2021
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
13 changes: 0 additions & 13 deletions ports/glog/glog_disable_debug_postfix.patch
View file
Open in desktop

This file was deleted.

28 changes: 16 additions & 12 deletions ports/glog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/glog
REF v0.4.0
SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
REF 8f9ccfe770add9e4c64e9b25c102658e3c763b73 #v0.5.0
SHA512 93dab1041ef4e3eb758c76325531ae32208dcf92c296c8c3404cfa249b3849cc24d5423e087478b17f79ccbae9dbcabe049e509d47c4ec6d7135ca8ca80dada5
HEAD_REF master
PATCHES
glog_disable_debug_postfix.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DWITH_PKGCONFIG=ON
-DWITH_GTEST=OFF
-DWITH_UNWIND=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glog)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glog)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

vcpkg_fixup_pkgconfig()

vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
13 changes: 10 additions & 3 deletions ports/glog/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{
"name": "glog",
"version-string": "0.4.0",
"port-version": 4,
"version": "0.5.0",
"description": "C++ implementation of the Google logging module",
"homepage": "https://github.com/google/glog",
"dependencies": [
"gflags"
"gflags",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2457,8 +2457,8 @@
"port-version": 4
},
"glog": {
"baseline": "0.4.0",
"port-version": 4
"baseline": "0.5.0",
"port-version": 0
},
"gloo": {
"baseline": "20201203",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fcb4a2bf36e257dac67b06b4b067768a119815e3",
"version": "0.5.0",
"port-version": 0
},
{
"git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47",
"version-string": "0.4.0",
Expand Down