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

[indicators] Update to 2.2 #20398

Merged
merged 3 commits into from
Sep 29, 2021
Merged

[indicators] Update to 2.2 #20398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae80cf3
Update indicators to 2.2
chausner Sep 27, 2021
217975f
Update CI baseline
chausner Sep 27, 2021
fd40e89
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 28, 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
21 changes: 11 additions & 10 deletions ports/indicators/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO p-ranav/indicators
REF b85eadb47c1d0f0edbb4da9c3b6384ec6486b24a # v2.0
SHA512 e9674440fa8643284a593b9e93345dc849301f42fe644b485e5dad1e12a20ef6687a2bf1eaeb2aec542d74544b7193c9b76b0166d7570781bc11604c71e8132a
REF v2.2
SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9
HEAD_REF master
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DINDICATORS_BUILD_TESTS=OFF
-DINDICATORS_SAMPLES=OFF
-DINDICATORS_DEMO=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

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

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

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE.termcolor DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
14 changes: 12 additions & 2 deletions ports/indicators/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"name": "indicators",
"version": "2.0",
"version": "2.2",
"description": "Activity indicators for modern C++",
"homepage": "https://github.com/p-ranav/indicators"
"homepage": "https://github.com/p-ranav/indicators",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,7 +2793,7 @@
"port-version": 0
},
"indicators": {
"baseline": "2.0",
"baseline": "2.2",
"port-version": 0
},
"influxdb-cxx": {
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/indicators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278",
"version": "2.2",
"port-version": 0
},
{
"git-tree": "d3271abb0e661db9fa81a346851c0caaa540ade6",
"version": "2.0",
Expand Down