microsoft · dan-shaw · Jun 17, 2022 · Jun 5, 2022 · Jun 5, 2022 · Jun 5, 2022
diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake
@@ -9,20 +9,22 @@ vcpkg_from_github(
 
 vcpkg_find_acquire_program(PYTHON2)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DPYTHON=${PYTHON2} # Switch to python3 on the next update
         -DUSE_WINDOWS6_API=ON
+        -DDISABLE_SHARED=${DISABLE_DYNAMIC}
 )
 
-vcpkg_install_cmake()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(GLOB EXE_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
 file(REMOVE ${EXE_DEBUG_FILES})
-file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
 file(REMOVE ${EXE_FILES})
 
-file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json
@@ -1,14 +1,19 @@
 {
   "name": "cppcms",
-  "version-string": "1.2.1",
-  "port-version": 4,
+  "version": "1.2.1",
+  "port-version": 5,
   "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development",
   "homepage": "https://github.com/artyom-beilis/cppcms",
-  "supports": "!(linux | osx)",
+  "license": "MIT",
+  "supports": "!(linux | osx | (windows & static))",
   "dependencies": [
     "icu",
     "openssl",
     "pcre",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake
@@ -1,16 +1,6 @@
-if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
-  message(FATAL_ERROR "This port is only for Windows Desktop or Linux")
-endif()
-
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-  message(FATAL_ERROR "This port is only for x64 architectures")
-endif()
-
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-
 set(MINIMUM_CUDNN_VERSION "7.6.5")
 
-include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake)
+include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake")
 vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION)
 
 # Try to find CUDNN if it exists; only download if it doesn't exist
@@ -71,6 +61,6 @@ else()
   message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.")
 endif()
 
-file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cudnn",
   "version": "7.6.5",
-  "port-version": 6,
+  "port-version": 7,
   "description": "NVIDIA's cuDNN deep neural network acceleration library.",
   "homepage": "https://developer.nvidia.com/cudnn",
   "license": null,

diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mrexodia/devicenameresolver

diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "devicenameresolver",
-  "version-string": "2016-06-26-0850d88fa6",
-  "port-version": 3,
+  "version-date": "2016-06-26",
+  "port-version": 4,
   "description": "a little library that resolves a path from a (virtual) device name.",
+  "license": null,
   "supports": "windows & !uwp",
   "dependencies": [
     {

diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO epsilon-project/epsilon
@@ -43,6 +41,13 @@ vcpkg_install_nmake(
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_copy_tools(TOOL_NAMES epsilon SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "epsilon",
-  "version-string": "0.9.2",
-  "port-version": 6,
+  "version": "0.9.2",
+  "port-version": 7,
   "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.",
   "homepage": "https://sourceforge.net/projects/epsilon-project/",
+  "license": "GPL-2.0-only OR LGPL-2.0-only",
   "supports": "windows",
   "dependencies": [
     "libpopt"

diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake
@@ -1,6 +1,3 @@
-# Official design
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libfann/fann
@@ -12,12 +9,11 @@ vcpkg_from_github(
         fix-uwp-build.patch
 )
 
-set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug)
-set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR})
+set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug")
+set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG
         -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin
         -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin
@@ -50,12 +46,16 @@ vcpkg_configure_cmake(
         -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json
@@ -1,7 +1,14 @@
 {
   "name": "fann",
   "version": "2.2.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.",
-  "homepage": "https://github.com/libfann/fann"
+  "homepage": "https://github.com/libfann/fann",
+  "license": "LGPL-2.1-only",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake
@@ -1,7 +1,3 @@
-if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "libbf does not support MSVC")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mavam/libbf
@@ -10,16 +6,13 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbf)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libbf/vcpkg.json b/ports/libbf/vcpkg.json
@@ -1,6 +1,14 @@
 {
   "name": "libbf",
-  "version-string": "1.0.0",
-  "port-version": 2,
-  "description": "Bloom filters for C++11."
+  "version": "1.0.0",
+  "port-version": 3,
+  "description": "Bloom filters for C++11.",
+  "license": "BSD-3-Clause",
+  "supports": "!windows",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -159,9 +159,6 @@ coolprop:x64-uwp=fail
 coroutine:arm-uwp=fail
 coroutine:x64-linux=fail
 coroutine:x64-uwp=fail
-cppcms:x64-linux=fail
-cppcms:x64-osx=fail
-cppcms:x64-windows-static=fail
 cppfs:arm-uwp=fail
 cppfs:x64-uwp=fail
 cppmicroservices:arm64-windows=fail
@@ -182,11 +179,6 @@ crashpad:x86-windows=fail
 ctemplate:x64-linux=fail
 ctemplate:x64-osx=fail
 cuda:x64-osx=fail
-cudnn:arm64-windows=fail
-cudnn:arm-uwp=fail
-cudnn:x64-uwp=fail
-cudnn:x64-windows-static=fail
-cudnn:x86-windows=fail
 # Since pipeline cannot automatically install dbghelp dependency, skip this detection
 dbghelp:arm-uwp=skip
 dbghelp:arm64-windows=skip
@@ -198,7 +190,6 @@ dbghelp:x64-windows-static-md=skip
 dbghelp:x64-windows=skip
 dbghelp:x86-windows=skip
 dcmtk:x64-uwp=fail
-devicenameresolver:x64-windows-static=fail
 # legacy directxsdk which conflicts with dxsdk-d3dx
 directxsdk:x86-windows=skip
 directxsdk:x64-windows=skip
@@ -248,8 +239,6 @@ embree2:x64-linux=skip
 embree2:x64-osx=skip
 epsilon:arm-uwp=fail
 epsilon:x64-uwp=fail
-epsilon:x64-windows-static=fail
-fann:x64-windows-static=fail
 fastrtps:arm-uwp=fail
 fastrtps:x64-uwp=fail
 fastrtps:x64-windows-static=fail
@@ -427,13 +416,6 @@ leveldb:arm-uwp=fail
 leveldb:x64-uwp=fail
 libaiff:x64-linux=fail
 libarchive:arm-uwp=fail
-libbf:arm64-windows=fail
-libbf:arm-uwp=fail
-libbf:x64-uwp=fail
-libbf:x64-windows=fail
-libbf:x64-windows-static=fail
-libbf:x64-windows-static-md=fail
-libbf:x86-windows=fail
 libcopp:arm64-windows=fail
 libcopp:arm-uwp=fail
 # Missing system libraries on linux to run/prepare autoconf

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1602,7 +1602,7 @@
     },
     "cppcms": {
       "baseline": "1.2.1",
-      "port-version": 4
+      "port-version": 5
     },
     "cppcodec": {
       "baseline": "0.2",
@@ -1742,7 +1742,7 @@
     },
     "cudnn": {
       "baseline": "7.6.5",
-      "port-version": 6
+      "port-version": 7
     },
     "cunit": {
       "baseline": "2.1.3",
@@ -1853,8 +1853,8 @@
       "port-version": 5
     },
     "devicenameresolver": {
-      "baseline": "2016-06-26-0850d88fa6",
-      "port-version": 3
+      "baseline": "2016-06-26",
+      "port-version": 4
     },
     "devil": {
       "baseline": "1.8.0",
@@ -2098,7 +2098,7 @@
     },
     "epsilon": {
       "baseline": "0.9.2",
-      "port-version": 6
+      "port-version": 7
     },
     "esaxx": {
       "baseline": "ca7cb332011ec37",
@@ -2154,7 +2154,7 @@
     },
     "fann": {
       "baseline": "2.2.0",
-      "port-version": 2
+      "port-version": 3
     },
     "farmhash": {
       "baseline": "1.1",
@@ -3446,7 +3446,7 @@
     },
     "libbf": {
       "baseline": "1.0.0",
-      "port-version": 2
+      "port-version": 3
     },
     "libbson": {
       "baseline": "1.17.6",

diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e944f382af84e4fc42f0371428c341b2c599bbe3",
+      "version": "1.2.1",
+      "port-version": 5
+    },
     {
       "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451",
       "version-string": "1.2.1",

diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588",
+      "version": "7.6.5",
+      "port-version": 7
+    },
     {
       "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653",
       "version": "7.6.5",

diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bb4e35f532b95841344719e4ab90027a2796d5d4",
+      "version-date": "2016-06-26",
+      "port-version": 4
+    },
     {
       "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1",
       "version-string": "2016-06-26-0850d88fa6",