[vcpkg manifest] Manifest Implementation (#11757)

==== Changes Related to manifests ====

* Add the `manifests` feature flag
  * This only says whether we look for a `vcpkg.json` in the cwd, not
    whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
  * `"authors"` -> `"maintainers"`
  * `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
  * reserve `"core"` in addition to `"default"`, since that's already
    reserved for features
  * Add a small helper note about what identifiers must look like
  * `<license-string>`: SPDX v3.8 -> v3.9
  * `"feature"."description"` is allowed to be an array of strings as well
  * `"version"` -> `"version-string"` for forward-compat with versions
    RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
  `-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
  * Requires either:
    * a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
      or `VCPKG_FEATURE_FLAGS`
    * Passing the `VCPKG_ENABLE_MANIFESTS` option
  * The toolchain will install your packages to
    `${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
  * Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
  `CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
  from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
  not passed
* Add support for parsing manifests!
* Add a filesystem lock!

==== Important Changes which are somewhat unrelated to manifests ====

* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
  expression
  * Split the parsing of platform expressions from checking whether
    they're true or not
  * Eagerly parse PlatformExpressions as opposed to leaving them as
    strings
* Add checking for feature flag consistency
  * i.e., if `-binarycaching` is passed, you shouldn't be passing
    `--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
  visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
  using magic constants
  * In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
  * This replaces the existing practice of
    `Version: <my-version>-<port-version>`

==== Smaller changes ====
* small drive-by cleanups to some CMake
  * `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
    `${CURRENT_INSTALLED_DIR}`
  * Remove `-analyze` when compiling with clang-cl, since that's not a
    supported flag (vcpkg's build system)
  * Add a message about which compiler is detected by vcpkg's build
    system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
  `strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors

22 files changed, 85 insertions, 48 deletions

diff --git a/ports/3fd/CONTROL b/ports/3fd/CONTROL
deleted file mode 100644
index 75eecaa31..000000000
--- a/ports/3fd/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: 3fd

-Version: 2.6.2-3

-Description: C++ Framework For Fast Development

-Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml

diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json
new file mode 100644
index 000000000..f183916e6
--- /dev/null
+++ b/ports/3fd/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "3fd",
+  "version-string": "2.6.2",
+  "port-version": 3,
+  "description": "C++ Framework For Fast Development",
+  "dependencies": [
+    {
+      "name": "boost-lockfree",
+      "platform": "windows"
+    },
+    {
+      "name": "boost-regex",
+      "platform": "windows"
+    },
+    {
+      "name": "poco",
+      "platform": "windows"
+    },
+    "sqlite3",
+    "rapidxml"
+  ]
+}
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
deleted file mode 100644
index e0ea57d1c..000000000
--- a/ports/abseil/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: abseil

-Version: 2020-03-03-7

-Homepage: https://github.com/abseil/abseil-cpp

-Description: an open-source collection designed to augment the C++ standard library.

-  Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.

-  In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.

-  Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.

-

-Feature: cxx17

-Description: Enable compiler C++17.

diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
new file mode 100644
index 000000000..cfc1022ea
--- /dev/null
+++ b/ports/abseil/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "abseil",
+  "version-string": "2020-03-03",
+  "port-version": 7,
+  "homepage": "https://github.com/abseil/abseil-cpp",
+  "description": [
+    "an open-source collection designed to augment the C++ standard library.",
+    "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
+    "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
+    "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."
+  ],
+  "features": [
+    {
+      "name": "cxx17",
+      "description": "Enable compiler C++17."
+    }
+  ]
+}
diff --git a/ports/argparse/CONTROL b/ports/argparse/CONTROL
deleted file mode 100644
index cfb3e8eed..000000000
--- a/ports/argparse/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: argparse

-Version: 2.1

-Description: Argument parser for modern C++

-Homepage: https://github.com/p-ranav/argparse

diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json
new file mode 100644
index 000000000..9137c655f
--- /dev/null
+++ b/ports/argparse/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "argparse",
+  "version-string": "2.1",
+  "description": "Argument parser for modern C++",
+  "license": "MIT",
+  "homepage": "https://github.com/p-ranav/argparse"
+}
diff --git a/ports/avisynthplus/CONTROL b/ports/avisynthplus/CONTROL
deleted file mode 100644
index 362eaaed9..000000000
--- a/ports/avisynthplus/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: avisynthplus
-Version: 3.6.0
-Homepage: http://avs-plus.net/
-Description: An improved version of the AviSynth frameserver, with improved features and developer friendliness
-Supports: !(uwp|arm|static)
diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
new file mode 100644
index 000000000..1af0142ea
--- /dev/null
+++ b/ports/avisynthplus/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "avisynthplus",
+  "version-string": "3.6.0",
+  "homepage": "http://avs-plus.net/",
+  "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
+  "supports": "!(uwp | arm | static)"
+}
diff --git a/ports/cmocka/CONTROL b/ports/cmocka/CONTROL
index 042cf23a7..d04945aa5 100644
--- a/ports/cmocka/CONTROL
+++ b/ports/cmocka/CONTROL
@@ -1,3 +1,4 @@
 Source: cmocka

-Version: 1.1.5-1

+Version: 1.1.5

+Port-Version: 2

 Description: An elegant unit testing framework for C with support for mock objects

diff --git a/ports/cmocka/vcpkg-cmake-wrapper.cmake b/ports/cmocka/vcpkg-cmake-wrapper.cmake
index 49b486ff8..c5626845b 100644
--- a/ports/cmocka/vcpkg-cmake-wrapper.cmake
+++ b/ports/cmocka/vcpkg-cmake-wrapper.cmake
@@ -3,8 +3,8 @@ _find_package(${ARGS})
 get_filename_component(_cmocka_lib_name ${CMOCKA_LIBRARY} NAME)

 

 set(CMOCKA_LIBRARY

-    debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_cmocka_lib_name}

-    optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_cmocka_lib_name}

+    debug ${CURRENT_INSTALLED_DIR}/debug/lib/${_cmocka_lib_name}

+    optimized ${CURRENT_INSTALLED_DIR}/lib/${_cmocka_lib_name}

 )

 

 set(CMOCKA_LIBRARIES ${CMOCKA_LIBRARY})

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index e3e821191..7bccf0f45 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,6 @@
 Source: libarchive

-Version: 3.4.1-3

+Version: 3.4.1

+Port-Version: 4

 Homepage: https://github.com/libarchive/libarchive

 Description: Library for reading and writing streaming archives

 Build-Depends: zlib

diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake b/ports/libarchive/vcpkg-cmake-wrapper.cmake
index c7b951a39..7893a23a4 100644
--- a/ports/libarchive/vcpkg-cmake-wrapper.cmake
+++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake
@@ -22,8 +22,8 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         list(APPEND LibArchive_LIBRARIES LibLZMA::LibLZMA)

     endif()

     if(@ENABLE_LZO@)

-        find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-        find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+        find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)

+        find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)

         if(LZO_LIBRARY_RELEASE)

             list(APPEND LibArchive_LIBRARIES optimized ${LZO_LIBRARY_RELEASE})

         endif()

@@ -32,8 +32,8 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         endif()

     endif()

     if(@ENABLE_ZSTD@)

-        find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-        find_library(ZSTD_LIBRARY_RELEASE NAMES zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+        find_library(ZSTD_LIBRARY_DEBUG NAMES zstdd zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)

+        find_library(ZSTD_LIBRARY_RELEASE NAMES zstd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)

         if(ZSTD_LIBRARY_RELEASE)

             list(APPEND LibArchive_LIBRARIES optimized ${ZSTD_LIBRARY_RELEASE})

         endif()

diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL
index acff1a893..4a5599053 100644
--- a/ports/libiconv/CONTROL
+++ b/ports/libiconv/CONTROL
@@ -1,4 +1,5 @@
 Source: libiconv
-Version: 1.16-3
+Version: 1.16
+Port-Version: 4
 Homepage: https://www.gnu.org/software/libiconv/
 Description: GNU Unicode text conversion
diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake
index 472dd8082..503cc57e2 100644
--- a/ports/libiconv/vcpkg-cmake-wrapper.cmake
+++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake
@@ -2,8 +2,8 @@ include(SelectLibraryConfigurations)
 

 _find_package(${ARGS})

 if(Iconv_FOUND)

-    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)

+    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)

     find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)

     select_library_configurations(CHARSET)

     list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})

diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake
index 5fd40d26c..b95afddc1 100644
--- a/ports/libpq/vcpkg-cmake-wrapper.cmake
+++ b/ports/libpq/vcpkg-cmake-wrapper.cmake
@@ -2,7 +2,7 @@
 find_library(PostgreSQL_LIBRARY_DEBUG

 NAMES pq

 PATHS

-  "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib"

+  "${CURRENT_INSTALLED_DIR}/debug/lib"

 NO_DEFAULT_PATH

 )

 _find_package(${ARGS})

diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL
index 80a0bc7e0..6c8d5c1bf 100644
--- a/ports/libxml2/CONTROL
+++ b/ports/libxml2/CONTROL
@@ -1,5 +1,6 @@
 Source: libxml2
-Version: 2.9.9-6
+Version: 2.9.9
+Port-Version: 7
 Homepage: https://xmlsoft.org/
 Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform)
 Build-Depends: zlib, libiconv, liblzma
diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake
index 8c81e2267..47a3f4f1c 100644
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@@ -3,11 +3,11 @@ if(LibXml2_FOUND)
     find_package(LibLZMA)

     find_package(ZLIB)

     include(SelectLibraryConfigurations)

-    find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-    find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+    find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)

+    find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)

     find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib)

-    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)

+    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH)

     find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)

     select_library_configurations(ICONV)

     select_library_configurations(CHARSET)

diff --git a/ports/qt5-base/cmake/find_qt_mkspec.cmake b/ports/qt5-base/cmake/find_qt_mkspec.cmake
index 08fae07cf..c9c06c8bd 100644
--- a/ports/qt5-base/cmake/find_qt_mkspec.cmake
+++ b/ports/qt5-base/cmake/find_qt_mkspec.cmake
@@ -77,10 +77,10 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_
             else()

             endif()

             foreach(_triplet ${_test_triplets})

-                find_program(QMAKE_PATH qmake PATHS  ${_VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS)

-                message(STATUS "Checking: ${_VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}")

+                find_program(QMAKE_PATH qmake PATHS  ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin NO_DEFAULT_PATHS)

+                message(STATUS "Checking: ${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5/bin. ${QMAKE_PATH}")

                 if(QMAKE_PATH)

-                    set(_tmp_host_root "${_VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5")

+                    set(_tmp_host_root "${VCPKG_INSTALLED_DIR}/${_triplet}/tools/qt5")

                     set(_tmp_host_qmake ${QMAKE_PATH} PARENT_SCOPE)

                     message(STATUS "Qt host tools root dir within vcpkg: ${_tmp_host_root}")

                     break()

@@ -98,4 +98,4 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_
         set(${EXT_HOST_TOOLS_OUT} ${_tmp_host_root} PARENT_SCOPE)

     endif()

 

-endfunction()
\ No newline at end of file
+endfunction()

diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL
index 27176d24e..382de52f3 100644
--- a/ports/raylib/CONTROL
+++ b/ports/raylib/CONTROL
@@ -1,5 +1,6 @@
 Source: raylib

 Version: 3.0.0

+Port-Version: 1

 Description: A simple and easy-to-use library to enjoy videogames programming

 Homepage: https://github.com/raysan5/raylib

 Supports: !(arm|uwp)

diff --git a/ports/raylib/vcpkg-cmake-wrapper.cmake b/ports/raylib/vcpkg-cmake-wrapper.cmake
index 1efda7c9e..81e9989ec 100644
--- a/ports/raylib/vcpkg-cmake-wrapper.cmake
+++ b/ports/raylib/vcpkg-cmake-wrapper.cmake
@@ -6,8 +6,8 @@ if(raylib_FOUND)
     get_filename_component(_raylib_lib_name ${raylib_LIBRARY} NAME)

 

     set(raylib_LIBRARY

-        debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_raylib_lib_name}

-        optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_raylib_lib_name}

+        debug ${CURRENT_INSTALLED_DIR}/debug/lib/${_raylib_lib_name}

+        optimized ${CURRENT_INSTALLED_DIR}/lib/${_raylib_lib_name}

     )

 

     set(raylib_LIBRARIES ${raylib_LIBRARY})

diff --git a/ports/spdk/CONTROL b/ports/spdk/CONTROL
index 0233395c1..a12729033 100644
--- a/ports/spdk/CONTROL
+++ b/ports/spdk/CONTROL
@@ -1,5 +1,6 @@
 Source: spdk
 Version: 19.01.1
+Port-Version: 1
 Description: Storage Performance Development Kit
 Build-Depends: spdk-dpdk, spdk-ipsec, spdk-isal
-Supports: linux
\ No newline at end of file
+Supports: linux
diff --git a/ports/spdk/usage b/ports/spdk/usage
index 6e791c3fe..f26b41649 100644
--- a/ports/spdk/usage
+++ b/ports/spdk/usage
@@ -7,7 +7,7 @@ Add following to build examples/nvme/perf/perf.c
 
     ADD_EXECUTABLE(SPDKTest perf.c)
 
-    TARGET_LINK_DIRECTORIES(SPDKTest PRIVATE ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/spdk)
+    TARGET_LINK_DIRECTORIES(SPDKTest PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/spdk)
     TARGET_LINK_LIBRARIES(SPDKTest PRIVATE
                           SPDK::spdk_app_rpc
                           SPDK::spdk_bdev