diff options
| author | Ryan <ryan__mckenzie@hotmail.com> | 2021-06-18 11:06:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 11:06:31 -0700 |
| commit | 08214e18eeb146542944067c35d77faca8962be5 (patch) | |
| tree | 8c8d6e2e89ae1e1d61c285f780a6f9a144a228bc | |
| parent | 727b6d58597605a2b9bcf292ca4362625fc51ac2 (diff) | |
| download | vcpkg-08214e18eeb146542944067c35d77faca8962be5.tar.gz vcpkg-08214e18eeb146542944067c35d77faca8962be5.zip | |
[infoware] update to latest commit (#18486)
* update infoware to latest commit
* update deprecated functions
* remove redundant file cleanup
* add versioning
| -rw-r--r-- | ports/infoware/portfile.cmake | 21 | ||||
| -rw-r--r-- | ports/infoware/vcpkg.json | 12 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/i-/infoware.json | 5 |
4 files changed, 27 insertions, 13 deletions
diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake index 670259003..e8b0703a8 100644 --- a/ports/infoware/portfile.cmake +++ b/ports/infoware/portfile.cmake @@ -3,26 +3,26 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ThePhD/infoware
- REF v0.6.0
- SHA512 38be9e375508c7fdee4be3540d80c95bf14dbef68c7880d3dc98de3128b43680c18ceb09fb0da33b6d31064d8cdbf0672671d6b4be4f0a4208a0b99d0224bd2e
+ REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df
+ SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064
HEAD_REF master
)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- x11 INFOWARE_USE_X11
- d3d INFOWARE_USE_D3D
- opencl INFOWARE_USE_OPENCL
- opengl INFOWARE_USE_OPENGL
+ FEATURES
+ x11 INFOWARE_USE_X11
+ d3d INFOWARE_USE_D3D
+ opencl INFOWARE_USE_OPENCL
+ opengl INFOWARE_USE_OPENGL
)
# git must be injected, because vcpkg isolates the build
# from the environment entirely to have reproducible builds
vcpkg_find_acquire_program(GIT)
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
OPTIONS
${FEATURE_OPTIONS}
-DINFOWARE_EXAMPLES=OFF
@@ -31,9 +31,8 @@ vcpkg_configure_cmake( -DGIT_FOUND=true
)
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json index 14c93e7f6..7b3956395 100644 --- a/ports/infoware/vcpkg.json +++ b/ports/infoware/vcpkg.json @@ -1,10 +1,20 @@ { "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", - "version-string": "0.6.0", + "version-date": "2021-06-16", "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "d3d": { "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)." diff --git a/versions/baseline.json b/versions/baseline.json index 371a72c57..e58be13da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2665,7 +2665,7 @@ "port-version": 0 }, "infoware": { - "baseline": "0.6.0", + "baseline": "2021-06-16", "port-version": 0 }, "inih": { diff --git a/versions/i-/infoware.json b/versions/i-/infoware.json index 73c24c5df..1f9a2257e 100644 --- a/versions/i-/infoware.json +++ b/versions/i-/infoware.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9c278f55bb9b202c251c0414d877a4a238b57214", + "version-date": "2021-06-16", + "port-version": 0 + }, + { "git-tree": "ea6cdef830ceb71bfa0d850127931972603d5695", "version-string": "0.6.0", "port-version": 0 |
