[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts

ports/corrade/portfile.cmake

@@ -10,28 +10,27 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
 # Handle features
-set(_COMPONENT_FLAGS "")
+set(_COMPONENTS "")
 foreach(_feature IN LISTS ALL_FEATURES)
     # Uppercase the feature name and replace "-" with "_"
     string(TOUPPER "${_feature}" _FEATURE)
     string(REPLACE "-" "_" _FEATURE "${_FEATURE}")
 
-    # Turn "-DWITH_*=" ON or OFF depending on whether the feature
-    # is in the list.
-    if(_feature IN_LIST FEATURES)
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON")
-    else()
-        list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF")
+    # Final feature is empty, ignore it
+    if(_feature)
+        list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE})
     endif()
 endforeach()
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
     OPTIONS
+        ${FEATURE_OPTIONS}
         -DUTILITY_USE_ANSI_COLORS=ON
         -DBUILD_STATIC=${BUILD_STATIC}
-        ${_COMPONENT_FLAGS}
 )
 
 vcpkg_install_cmake()
@@ -68,5 +67,4 @@ file(INSTALL ${SOURCE_PATH}/COPYING
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
     RENAME copyright)
 
-
 vcpkg_copy_pdbs()

ports/corrade/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "corrade",
   "version-string": "2020.06",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++11/C++14 multiplatform utility library.",
   "homepage": "https://magnum.graphics/corrade/",
   "default-features": [

ports/magnum-plugins/CONTROL

@@ -1,6 +1,6 @@
 Source: magnum-plugins
 Version: 2020.06
-Port-Version: 5
+Port-Version: 6
 Build-Depends: magnum[core]
 Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/

ports/magnum-plugins/portfile.cmake

@@ -5,7 +5,6 @@ vcpkg_from_github(
     SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0
     HEAD_REF master
     PATCHES
-        001-tools-path.patch
         002-fix-stb-conflict.patch
 )
 

ports/magnum/CONTROL

@@ -1,6 +1,6 @@
 Source: magnum
 Version: 2020.06
-Port-Version: 5
+Port-Version: 6
 Build-Depends: corrade[utility]
 Description: C++11/C++14 graphics middleware for games and data visualization
 Homepage: https://magnum.graphics/

ports/magnum/portfile.cmake

@@ -5,7 +5,6 @@ vcpkg_from_github(
     SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042
     HEAD_REF master
     PATCHES
-        001-tools-path.patch
         002-sdl-includes.patch
 )
 

versions/baseline.json

@@ -1398,7 +1398,7 @@
     },
     "corrade": {
       "baseline": "2020.06",
-      "port-version": 1
+      "port-version": 2
     },
     "cpp-base64": {
       "baseline": "V2.rc.08",
@@ -3934,7 +3934,7 @@
     },
     "magnum": {
       "baseline": "2020.06",
-      "port-version": 5
+      "port-version": 6
     },
     "magnum-extras": {
       "baseline": "2020.06",
@@ -3946,7 +3946,7 @@
     },
     "magnum-plugins": {
       "baseline": "2020.06",
-      "port-version": 5
+      "port-version": 6
     },
     "mailio": {
       "baseline": "0.20.0",

versions/c-/corrade.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb",
+      "version-string": "2020.06",
+      "port-version": 2
+    },
     {
       "git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d",
       "version-string": "2020.06",

versions/m-/magnum-plugins.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6",
+      "version-string": "2020.06",
+      "port-version": 6
+    },
     {
       "git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5",
       "version-string": "2020.06",

versions/m-/magnum.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7",
+      "version-string": "2020.06",
+      "port-version": 6
+    },
     {
       "git-tree": "cb97c301133d04f205cb1547e5559341474f842e",
       "version-string": "2020.06",