From 70610f449497db0f87f2484ade4e88c78aa6f085 Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Thu, 29 Apr 2021 22:49:04 +0200 Subject: [magnum,-plugins] Fix deprecated use of vcpkg_check_features (#17016) Signed-off-by: Squareys --- ports/magnum-plugins/CONTROL | 2 +- ports/magnum-plugins/portfile.cmake | 2 +- ports/magnum/CONTROL | 2 +- ports/magnum/portfile.cmake | 2 +- versions/baseline.json | 4 ++-- versions/m-/magnum-plugins.json | 5 +++++ versions/m-/magnum.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index 49a692393..bbec383e9 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins Version: 2020.06 -Port-Version: 4 +Port-Version: 5 Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index c90eaefe2..f1c27750e 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -64,7 +64,7 @@ foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) endif() endforeach() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ${_COMPONENTS}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 01e4a8fc7..b595fa45c 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,6 +1,6 @@ Source: magnum Version: 2020.06 -Port-Version: 4 +Port-Version: 5 Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 9ad60180f..e4144595e 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -69,7 +69,7 @@ foreach(_feature IN LISTS ALL_SUPPORTED_FEATURES) endif() endforeach() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ${_COMPONENTS}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/versions/baseline.json b/versions/baseline.json index fd37a0de3..742753219 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3790,7 +3790,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 4 + "port-version": 5 }, "magnum-extras": { "baseline": "2020.06", @@ -3802,7 +3802,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 4 + "port-version": 5 }, "mailio": { "baseline": "0.20.0", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index 3a50a7ca9..84b2d06f1 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5", + "version-string": "2020.06", + "port-version": 5 + }, { "git-tree": "05b4c54140907b0b46926c50e0b56bc80051b218", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index d2cdf0bb6..6103787d6 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb97c301133d04f205cb1547e5559341474f842e", + "version-string": "2020.06", + "port-version": 5 + }, { "git-tree": "96fbedbdb7cac5cb1624af746d6e4b2cb4b57cc8", "version-string": "2020.06", -- cgit v1.2.3