Merge branch 'master' into dev/jack/4167

2025-01-19 11:03:02 +08:00 · 2019-08-16 10:01:32 +08:00 · 2019-08-16 10:01:32 +08:00 · adb84c2658
commit adb84c2658
parent 2865da8f4a 22e787f944
725 changed files with 32314 additions and 7942 deletions
--- a/.github/ISSUE_TEMPLATE/i-have-a-question.md
+++ b/.github/ISSUE_TEMPLATE/i-have-a-question.md
@ -0,0 +1,10 @@
+---
+name: I have a question
+about: I have a question and don't see a clear answer in documentation
+title: How do I ...
+labels: Question
+assignees: ''
+
+---
+
+When asking a question please also include where you looked for an answer (so we can update the documentation if needed).
--- a/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
@ -0,0 +1,31 @@
+---
+name: Other type of bug report
+about: Let us know about an issues that does not fit into any of the other issues
+  types
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Environment**
+- OS: [e.g. Windows/Linux etc...]
+- Compiler: revision
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ./vcpkg install xxxx
+2. See error
+Repro code when
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Failure logs** 
+-(please attached failure logs)
+
+**Additional context**
+Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/report-package-build-failure.md
+++ b/.github/ISSUE_TEMPLATE/report-package-build-failure.md
@ -0,0 +1,23 @@
+---
+name: Report package build failure
+about: Let us know about build failures in ports.
+title: "[<port name>] build failure"
+labels: port bug
+assignees: ''
+
+---
+
+**Host Environment**
+- OS: [e.g. Windows/Linux etc...]
+- Compiler: revision
+
+**To Reproduce**
+Steps to reproduce the behavior:
+`./vcpkg install xxxx`
+
+**Failure logs** 
+-Cut and past the appropriate build messages from the console output.
+-Please attach any additional failure logs mentioned in the console output.
+
+**Additional context**
+Add any other context about the problem here, such as what you have already tried to resolve the issue.
--- a/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md
+++ b/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement-to-a-port.md
@ -0,0 +1,22 @@
+---
+name: Request a feature or improvement to a port
+about: Suggest an improvement to one the the ports/libraries in vcpkg
+title: "[<portname>] <short description of feature>"
+labels: port feature
+assignees: ''
+
+---
+
+****
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Proposed solution**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered if applicable.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md
+++ b/.github/ISSUE_TEMPLATE/request-a-feature-or-improvement.md
@ -0,0 +1,22 @@
+---
+name: Request a feature or improvement
+about: Suggest an improvement to vcpkg
+title: ''
+labels: vcpkg feature
+assignees: ''
+
+---
+
+****
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Proposed solution**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/request-a-new-port.md
+++ b/.github/ISSUE_TEMPLATE/request-a-new-port.md
@ -0,0 +1,18 @@
+---
+name: Request a new port
+about: Request a new port/library that vcpkg should support
+title: "[New Port Request] <library name here>"
+labels: new port request - consider making a PR!
+assignees: ''
+
+---
+
+Library name:
+
+Library description:
+
+Source repository URL:
+
+Project homepage (if different from the source repository):
+
+Anything else that is useful to know when adding (such as optional features the library may have that should be included):
--- a/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md
+++ b/.github/ISSUE_TEMPLATE/request-an-update-to-an-existing-port.md
@ -0,0 +1,14 @@
+---
+name: Request an update to an existing port
+about: Let us know about a new version of a library we should pick up.
+title: "[<port name>] update to <version>"
+labels: port feature
+assignees: ''
+
+---
+
+Library name:
+
+New version number:
+
+Other information that may be useful (release notes, etc...)
--- a/.gitignore
+++ b/.gitignore
@ -11,7 +11,7 @@
 *.userosscache
 *.sln.docstates

-toolsrc/out
+toolsrc/out*
 toolsrc/CMakeSettings.json

 # User-specific files (MonoDevelop/Xamarin Studio)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,625 @@
+vcpkg (2019.7.31)
+---
+#### Total port count: 1105
+#### Total port count per triplet (tested): 
+|triplet|ports available|
+|---|---|
+|**x64-windows**|1039|
+|x86-windows|1009|
+|x64-windows-static|928|
+|**x64-linux**|866|
+|**x64-osx**|788|
+|arm64-windows|678|
+|x64-uwp|546|
+|arm-uwp|522|
+
+#### The following commands and options have been updated:
+- --scripts-root ***[NEW OPTION]***
+    - Specify a directory to use in place of `<vcpkg root>/scripts`. Enables a shared script directory for those using a single vcpkg instance to manage distributed port directories
+        - [(#6552)](https://github.com/microsoft/vcpkg/pull/6552) Allow redirection of the scripts folder.
+- depend-info
+    - Allow `vcpkg depend-info port[feature]` to display port-dependency information for a given port and the specified feature.
+        - [(#6797)](https://github.com/microsoft/vcpkg/pull/6797) Make `depend-info` subcommand able to handle features
+
+#### The following documentation has been updated:
+- [Overlay triplets example: build dynamic libraries on Linux](docs/examples/overlay-triplets-linux-dynamic.md) ***[NEW]***
+    - [(#7291)](https://github.com/microsoft/vcpkg/pull/7291) Example: Building dynamic libraries on Linux using overlay triplets
+- [vcpkg_from_git](docs/maintainers/vcpkg_from_git.md)
+    - [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
+- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md)
+    - [(#7390)](https://github.com/microsoft/vcpkg/pull/7390) [docs] add notes about manual-link
+
+#### The following *remarkable* changes have been made to vcpkg's infrastructure:
+- `VCPKG_ENV_PASSTHROUGH` triplet variable and `environment-overrides.cmake`
+    -  Port authors can add an `environment-overrides.cmake` file to a port to override triplet settings globally or to define behavior of the vpckg binary on a per port basis
+        - [(#7290)](https://github.com/microsoft/vcpkg/pull/7290) [vcpkg] Environment Variable Passthrough
+        - [(#7292)](https://github.com/microsoft/vcpkg/pull/7292) [vcpkg] Portfile Settings
+- Testing overhaul
+    - Tests have been migrated from the Visual Studio unit testing framework to the cross-platform [Catch2](https://github.com/catchorg/Catch2)
+        - [(#7315)](https://github.com/microsoft/vcpkg/pull/7315) Rewrite the tests! now they're cross-platform!
+
+#### The following *additional* changes have been made to vcpkg's infrastructure:
+- [(#7080)](https://github.com/microsoft/vcpkg/pull/7080) [vcpkg] Use spaces instead of semicolons in the output
+- [(#6791)](https://github.com/microsoft/vcpkg/pull/6791) Update python2, python3, perl, aria2, ninja, ruby, 7z
+- [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
+- [(#7117)](https://github.com/microsoft/vcpkg/pull/7117) Revert Visual Studio projects versions
+- [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows
+- [(#7135)](https://github.com/microsoft/vcpkg/pull/7135) revert ninja update
+- [(#7136)](https://github.com/microsoft/vcpkg/pull/7136) Bump version to warn of outdated vcpkg sources
+- [(#7094)](https://github.com/microsoft/vcpkg/pull/7094) [vcpkg] Fix powershell font corruption bug
+- [(#7158)](https://github.com/microsoft/vcpkg/pull/7158) [vcpkg] Fix incorrect setting of FEATURE_OPTIONS
+- [(#6792)](https://github.com/microsoft/vcpkg/pull/6792) Cleanup vcpkg_configure_cmake.cmake
+- [(#7175)](https://github.com/microsoft/vcpkg/pull/7175) Added nasm mirror as nasm.us is down again
+- [(#7216)](https://github.com/microsoft/vcpkg/pull/7216) [vcpkg] allow spaces in pathname on linux
+- [(#7243)](https://github.com/microsoft/vcpkg/pull/7243) Testing for --overlay-ports and --overlay-triplets args
+- [(#7294)](https://github.com/microsoft/vcpkg/pull/7294) Add June changelog
+- [(#7229)](https://github.com/microsoft/vcpkg/pull/7229) Better error message when VCPKG_ROOT is independently defined
+- [(#7336)](https://github.com/microsoft/vcpkg/pull/7336) Create issue templates
+- [(#7322)](https://github.com/microsoft/vcpkg/pull/7322) Resolves "project is never up-to-date" problem (issue 6179)
+- [(#7228)](https://github.com/microsoft/vcpkg/pull/7228) Parallel file operations
+- [(#7403)](https://github.com/microsoft/vcpkg/pull/7403) Add third party notices -- copied from chakracore
+- [(#7407)](https://github.com/microsoft/vcpkg/pull/7407) Modify CMakeLists to split up vcpkglib
+- [(#7430)](https://github.com/microsoft/vcpkg/pull/7430) [vcpkg] Fix RealFilesystem::remove_all
+
+<details>
+<summary><b>The following 37 ports have been added:</b></summary>
+
+|port|version|
+|---|---|
+|[septag-sx](https://github.com/microsoft/vcpkg/pull/6327)| 2019-05-07-1
+|[librdkafka](https://github.com/microsoft/vcpkg/pull/5921)| 1.1.0
+|[soxr](https://github.com/microsoft/vcpkg/pull/6478)| 0.1.3.
+|[czmq](https://github.com/microsoft/vcpkg/pull/4979)<sup>[#7186](https://github.com/microsoft/vcpkg/pull/7186) </sup>| 2019-06-10-1
+|[cppmicroservices](https://github.com/microsoft/vcpkg/pull/6388)| 4.0.0-pre1
+|[zookeeper](https://github.com/microsoft/vcpkg/pull/7000)| 3.5.5
+|[xmlsec](https://github.com/microsoft/vcpkg/pull/7196)| 1.2.28
+|[librsvg](https://github.com/microsoft/vcpkg/pull/6807)| 2.40.20
+|[7zip](https://github.com/microsoft/vcpkg/pull/6920)| 19.00
+|[genann](https://github.com/microsoft/vcpkg/pull/7195)| 2019-07-10
+|[offscale-libetcd-cpp](https://github.com/microsoft/vcpkg/pull/6999)| 2019-07-10
+|[rabit](https://github.com/microsoft/vcpkg/pull/7234)| 0.1
+|[zyre](https://github.com/microsoft/vcpkg/pull/7189)| 2019-07-07
+|[cpp-peglib](https://github.com/microsoft/vcpkg/pull/7254)| 0.1.0
+|[paho-mqttpp3](https://github.com/microsoft/vcpkg/pull/7033)| 1.0.1
+|[openxr-loader](https://github.com/microsoft/vcpkg/pull/6339)<sup>[#7376](https://github.com/microsoft/vcpkg/pull/7376) [#7488](https://github.com/microsoft/vcpkg/pull/7488) </sup>| 1.0.0-1
+|[wintoast](https://github.com/microsoft/vcpkg/pull/7006)| 1.2.0
+|[scnlib](https://github.com/microsoft/vcpkg/pull/7014)| 0.1.2
+|[mongoose](https://github.com/microsoft/vcpkg/pull/7089)| 6.15-1
+|[nameof](https://github.com/microsoft/vcpkg/pull/7250)| 2019-07-13
+|[leaf](https://github.com/microsoft/vcpkg/pull/7319)<sup>[#7468](https://github.com/microsoft/vcpkg/pull/7468) </sup>| 0.2.1-2
+|[otl](https://github.com/microsoft/vcpkg/pull/7272)| 4.0.442
+|[dbg-macro](https://github.com/microsoft/vcpkg/pull/7237)| 2019-07-11
+|[p-ranav-csv](https://github.com/microsoft/vcpkg/pull/7236)| 2019-07-11
+|[lastools](https://github.com/microsoft/vcpkg/pull/7220)| 2019-07-10
+|[basisu](https://github.com/microsoft/vcpkg/pull/6995)<sup>[#7468](https://github.com/microsoft/vcpkg/pull/7468) </sup>| 0.0.1-1
+|[cmcstl2](https://github.com/microsoft/vcpkg/pull/7348)| 2019-07-20
+|[libconfuse](https://github.com/microsoft/vcpkg/pull/7252)| 2019-07-14
+|[boolinq](https://github.com/microsoft/vcpkg/pull/7362)| 2019-07-22
+|[libzippp](https://github.com/microsoft/vcpkg/pull/6801)| 2019-07-22
+|[mimalloc](https://github.com/microsoft/vcpkg/pull/7011)| 2019-06-25
+|[liblas](https://github.com/microsoft/vcpkg/pull/6746)| 1.8.1
+|[xtensor-io](https://github.com/microsoft/vcpkg/pull/7398)| 0.7.0
+|[easycl](https://github.com/microsoft/vcpkg/pull/7387)| 0.3
+|[nngpp](https://github.com/microsoft/vcpkg/pull/7417)| 2019-07-25
+|[mpi](https://github.com/microsoft/vcpkg/pull/7142)| 1
+|[openmpi](https://github.com/microsoft/vcpkg/pull/7142)| 4.0.1
+</details>
+
+<details>
+<summary><b>The following 160 ports have been updated:</b></summary>
+
+- openssl-unix `1.0.2q` -> `1.0.2s-1`
+    - [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s
+    - [(#6512)](https://github.com/microsoft/vcpkg/pull/6512) [openssl-unix] Shared library support
+
+- openssl-windows `1.0.2q-2` -> `1.0.2s-1`
+    - [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s
+
+- mongo-cxx-driver `3.4.0-2` -> `3.4.0-3`
+    - [(#7050)](https://github.com/microsoft/vcpkg/pull/7050) [mongo-cxx-driver] Do not delete the third_party include folder when building with mnmlstc
+
+- fdlibm `5.3-3` -> `5.3-4`
+    - [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
+
+- azure-iot-sdk-c `2019-05-16.1` -> `2019-07-01.1`
+    - [(#7123)](https://github.com/microsoft/vcpkg/pull/7123) [azure] Update azure-iot-sdk-c for public-preview release of 2019-07-01
+
+- open62541 `0.3.0-1` -> `0.3.0-2`
+    - [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows
+
+- lua `5.3.5-1` -> `5.3.5-2`
+    - [(#7101)](https://github.com/microsoft/vcpkg/pull/7101) [lua] Add [cpp] feature to additionally build lua-c++
+
+- flann `1.9.1-1` -> `2019-04-07-1`
+    - [(#7125)](https://github.com/microsoft/vcpkg/pull/7125) [flann]Change the version tag to the corresponding time of commit id.
+
+- tbb `2019_U7` -> `2019_U7-1`
+    - [(#6510)](https://github.com/microsoft/vcpkg/pull/6510) [tbb] Add shared library support for Linux and OSX
+
+- dcmtk `3.6.4` -> `3.6.4-1`
+    - [(#7059)](https://github.com/microsoft/vcpkg/pull/7059) [dcmtk] support wchar_t* filename
+
+- libmupdf `1.15.0` -> `1.15.0-1`
+    - [(#7107)](https://github.com/microsoft/vcpkg/pull/7107) [libmupdf] Enable the old patch for fixing C2169
+
+- mongo-c-driver `1.14.0-2` -> `1.14.0-3`
+    - [(#7048)](https://github.com/microsoft/vcpkg/pull/7048) [mongo-c-driver] Add usage
+    - [(#7338)](https://github.com/microsoft/vcpkg/pull/7338) [mongo-c-driver] Disable snappy auto-detection
+
+- openimageio `1.8.16` -> `2.0.8`
+    - [(#7173)](https://github.com/microsoft/vcpkg/pull/7173) [openimageio] Upgrade to version 2.0.8
+
+- duktape `2.3.0` -> `2.3.0-2`
+    - [(#7170)](https://github.com/microsoft/vcpkg/pull/7170) [duktape] Fix package not found by find_package.
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- poco `2.0.0-pre-2` -> `2.0.0-pre-3`
+    - [(#7169)](https://github.com/microsoft/vcpkg/pull/7169) [Poco] Add missing ipjlpapi.lib to foundation library
+
+- gsoap `2.8.84-1` -> `2.8.87-1`
+    - [(#7145)](https://github.com/microsoft/vcpkg/pull/7145) [gsoap] Update to 2.8.87
+
+- qt5-mqtt `5.12.3` -> `5.12.3-1`
+    - [(#7130)](https://github.com/microsoft/vcpkg/pull/7130) [qt5-mqtt] crossplatform add to path
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- botan `2.9.0-1` -> `2.9.0-2`
+    - [(#7140)](https://github.com/microsoft/vcpkg/pull/7140) [botan] Fix build error C2039 with Visual Studio 2019 and C++17
+    - [(#7303)](https://github.com/microsoft/vcpkg/pull/7303) [botan] Fix parallel build
+
+- kinectsdk2 `2.0` -> `2.0-1`
+    - [(#7143)](https://github.com/microsoft/vcpkg/pull/7143) kinectsdk2: fix missing header files
+
+- civetweb `1.11-1` -> `2019-07-05`
+    - [(#7166)](https://github.com/microsoft/vcpkg/pull/7166) [civetweb] Upgrade and enable feature websocket
+
+- curl `7.65.0-2` -> `7.65.2-1`
+    - [(#7156)](https://github.com/microsoft/vcpkg/pull/7156) [curl] Add features.
+    - [(#7093)](https://github.com/microsoft/vcpkg/pull/7093) [curl] Update to 7.65.2
+
+- aws-checksums `0.1.2` -> `0.1.3`
+    - [(#7154)](https://github.com/microsoft/vcpkg/pull/7154) [aws-checksums]Upgrade version to 0.1.3
+
+- rapidjson `1.1.0-3` -> `d87b698-1`
+    - [(#7152)](https://github.com/microsoft/vcpkg/pull/7152) [rapidjson] Update to the latest commit and also fix #3401.
+    - [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS
+
+- freetype `2.10.0` -> `2.10.1-1`
+    - [(#7141)](https://github.com/microsoft/vcpkg/pull/7141) [freetype]Re-fixed the issue of exporting symbols when building dynamic library.
+    - [(#7341)](https://github.com/microsoft/vcpkg/pull/7341) [freetype] Update to 2.10.1
+
+- llvm `7.0.0-3` -> `8.0.0`
+    - [(#7209)](https://github.com/microsoft/vcpkg/pull/7209) [llvm] Update to 8.0.0
+
+- reproc `6.0.0-1` -> `6.0.0-2`
+    - [(#7208)](https://github.com/microsoft/vcpkg/pull/7208) [reproc] Fix reproc++ installation path
+
+- wil `2019-06-10` -> `2019-07-16`
+    - [(#7215)](https://github.com/microsoft/vcpkg/pull/7215) [wil] Update
+    - [(#7285)](https://github.com/microsoft/vcpkg/pull/7285)  Update wil port to match the commit used for NuGet package 1.0.190716.2
+
+- tesseract `4.0.0-3` -> `4.1.0-1`
+    - [(#7144)](https://github.com/microsoft/vcpkg/pull/7144) [tesseract] Fix Port. Making it crossplatform
+    - [(#7227)](https://github.com/microsoft/vcpkg/pull/7227) [tesseract] port update to 4.1.0 release
+    - [(#7360)](https://github.com/microsoft/vcpkg/pull/7360) [tesseract[training_tools]] Fix build error
+
+- zeromq `2019-05-07` -> `2019-07-09`
+    - [(#7203)](https://github.com/microsoft/vcpkg/pull/7203) [zeromq] Update to 4.3.2
+
+- spirv-tools `2019.3-dev` -> `2019.3-dev-1`
+    - [(#7204)](https://github.com/microsoft/vcpkg/pull/7204) [spirv-tools] Fix removed patch
+
+- libraqm `0.6.0` -> `0.7.0`
+    - [(#7149)](https://github.com/microsoft/vcpkg/pull/7149) [libraqm] Update libraqm to 0.7.0
+    - [(#7263)](https://github.com/microsoft/vcpkg/pull/7263) [libraqm] Fix copying raqm-version.h to include directory
+
+- pthreads `3.0.0-1` -> `3.0.0-2`
+    - [(#7178)](https://github.com/microsoft/vcpkg/pull/7178) [pthreads4W] vcpkg wrapper fixes
+
+- libkml `1.3.0-2` -> `1.3.0-3`
+    - [(#7194)](https://github.com/microsoft/vcpkg/pull/7194) [libkml] Fix install path
+    - [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature
+
+- gherkin-c `4.1.2` -> `2019-10-07-1`
+    - [(#7231)](https://github.com/microsoft/vcpkg/pull/7231) [gherkin-b] update to latest
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- google-cloud-cpp `0.10.0` -> `0.11.0`
+    - [(#7134)](https://github.com/microsoft/vcpkg/pull/7134) Upgrade google-cloud-cpp to v0.11.0.
+
+- sqlite3 `3.28.0-1` -> `3.29.0-1`
+    - [(#7202)](https://github.com/microsoft/vcpkg/pull/7202) [sqlite3-tool]Fix build error on arm/uwp platform.
+    - [(#7342)](https://github.com/microsoft/vcpkg/pull/7342) [sqlite3] Update to 3.29.0
+
+- nonius `2019-04-20` -> `2019-04-20-1`
+    - [(#7258)](https://github.com/microsoft/vcpkg/pull/7258) [nonius] properly install noniusConfig.cmake
+
+- leveldb `1.22` -> `1.22-1`
+    - [(#7245)](https://github.com/microsoft/vcpkg/pull/7245) [leveldb] Fix cmake config
+
+- bond `8.1.0` -> `8.1.0-2`
+    - [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS
+    - [(#7306)](https://github.com/microsoft/vcpkg/pull/7306) [bond] make haskell an external dependency
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- cpprestsdk `2.10.13-1` -> `2.10.14`
+    - [(#7286)](https://github.com/microsoft/vcpkg/pull/7286) Update cpprestsdk to v2.10.14.
+
+- qt5-base `5.12.3-1` -> `5.12.3-3`
+    - [(#6983)](https://github.com/microsoft/vcpkg/pull/6983) [qt5-base]Add a print message to inform the user to install the dependency package.
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-3d `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-activeqt `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-charts `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-connectivity `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-datavis3d `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-declarative `5.12.3-1` -> `5.12.3-2`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-gamepad `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-graphicaleffects `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-imageformats `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-location `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-macextras `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-modularscripts `2019-04-30` -> `2019-04-30-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-multimedia `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-networkauth `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-purchasing `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-quickcontrols `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-quickcontrols2 `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-remoteobjects `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-script `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-scxml `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-sensors `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-serialport `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-speech `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-svg `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-tools `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-virtualkeyboard `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-webchannel `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-websockets `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-webview `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- qt5-winextras `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+    - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
+
+- qt5-xmlpatterns `5.12.3` -> `5.12.3-1`
+    - [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
+
+- rocksdb `6.0.2` -> `6.1.2`
+    - [(#7304)](https://github.com/microsoft/vcpkg/pull/7304) [rocksdb] Update rocksdb to 6.1.2, adds optional zstd feature
+
+- metis `5.1.0-3` -> `5.1.0-5`
+    - [(#7299)](https://github.com/microsoft/vcpkg/pull/7299) [metis] Fix linux build error.
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- ecsutil `1.0.6.1` -> `1.0.7.2`
+    - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
+    - [(#7427)](https://github.com/microsoft/vcpkg/pull/7427) [ECSUtil] update library to v1.0.7.2
+
+- soundtouch `2.0.0-2` -> `2.0.0-3`
+    - [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
+
+- libsodium `1.0.18` -> `1.0.18-1`
+    - [(#7297)](https://github.com/microsoft/vcpkg/pull/7297) [libsodium] Fix Linux build error.
+
+- irrlicht `1.8.4` -> `1.8.4-2`
+    - [(#7296)](https://github.com/microsoft/vcpkg/pull/7296) [irrlicht] add vcpkg-cmake-wrapper
+    - [(#7354)](https://github.com/microsoft/vcpkg/pull/7354) [irrlicht] use unicode path on windows
+
+- libyaml `0.2.2` -> `0.2.2-1`
+    - [(#7277)](https://github.com/microsoft/vcpkg/pull/7277) [libyaml] Fix build error
+
+- eastl `3.13.05-1` -> `3.14.00`
+    - [(#7276)](https://github.com/microsoft/vcpkg/pull/7276) [eastl] Upgrade to 3.14
+
+- boost-asio `1.70.0-1` -> `1.70.0-2`
+    - [(#7267)](https://github.com/microsoft/vcpkg/pull/7267) Fixed boost-asio on Windows
+
+- minizip `1.2.11-4` -> `1.2.11-5`
+    - [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature
+
+- blend2d `beta_2019-04-30` -> `beta_2019-07-16`
+    - [(#7239)](https://github.com/microsoft/vcpkg/pull/7239) [blend2d] Port update
+
+- so5extra `1.2.3-1` -> `1.3.1`
+    - [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates
+
+- sobjectizer `5.5.24.4-1` -> `5.6.0.2`
+    - [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates
+
+- directxtk `apr2019` -> `apr2019-1`
+    - [(#7233)](https://github.com/microsoft/vcpkg/pull/7233) [DirectXTK] Fix UWP build error
+
+- restbed `4.16-07-28-2018` -> `4.16-07-28-2018-1`
+    - [(#7232)](https://github.com/microsoft/vcpkg/pull/7232) [restbed] Add openssl feature
+
+- clapack `3.2.1-9` -> `3.2.1-10`
+    - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
+
+- geogram `1.6.9-6` -> `1.6.9-7`
+    - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
+
+- mlpack `3.1.1` -> `3.1.1-1`
+    - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
+
+- openblas `0.3.6-4` -> `0.3.6-5`
+    - [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
+
+- pprint `2019-06-01` -> `2019-07-19`
+    - [(#7317)](https://github.com/microsoft/vcpkg/pull/7317) [pprint] Fix #7301
+
+- boost-type-erasure `1.70.0` -> `1.70.0-1`
+    - [(#7325)](https://github.com/microsoft/vcpkg/pull/7325) [boost-type-erasure] fix depends on arm
+
+- armadillo `2019-04-16-3` -> `2019-04-16-4`
+    - [(#7041)](https://github.com/microsoft/vcpkg/pull/7041)  [armadillo] Fix installation path
+
+- cutelyst2 `2.7.0` -> `2.8.0`
+    - [(#7327)](https://github.com/microsoft/vcpkg/pull/7327) [cutelyst2]Upgrade version to 2.8.0
+
+- sdl2-image `2.0.4-3` -> `2.0.5`
+    - [(#7355)](https://github.com/microsoft/vcpkg/pull/7355) [sdl2-image] Updated to 2.0.5
+
+- qhull `7.2.1-3` -> `7.3.2`
+    - [(#7340)](https://github.com/microsoft/vcpkg/pull/7340) [qhull] Update to 7.3.2 and fix postbuild validation
+
+- libexif `0.6.21-1` -> `0.6.21-2`
+    - [(#7344)](https://github.com/microsoft/vcpkg/pull/7344) [Libexif] update download location
+
+- arrow `0.13.0-4` -> `0.14.1`
+    - [(#7211)](https://github.com/microsoft/vcpkg/pull/7211) [Arrow] Update to Arrow v0.14.1
+
+- date `ed0368f` -> `2019-05-18-1`
+    - [(#7399)](https://github.com/microsoft/vcpkg/pull/7399) [date] Fix issue with feature remote-api
+
+- libmariadb `3.0.10-1` -> `3.0.10-3`
+    - [(#7396)](https://github.com/microsoft/vcpkg/pull/7396) [libmariadb] Fix build library type and install path
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- inja `2.1.0` -> `2.1.0-1`
+    - [(#7402)](https://github.com/microsoft/vcpkg/pull/7402) [inja] Use inja CMakeLists.txt
+
+- pcl `1.9.1-4` -> `1.9.1-5`
+    - [(#7388)](https://github.com/microsoft/vcpkg/pull/7388) [pcl] Fix cuda building compatability issues with cuda 10.1
+
+- thrift `2019-05-07-2` -> `2019-05-07-3`
+    - [(#7302)](https://github.com/microsoft/vcpkg/pull/7302) [Thrift] Make Thrift static again
+
+- forest `12.0.0` -> `12.0.3`
+    - [(#7410)](https://github.com/microsoft/vcpkg/pull/7410) [forest] Update to Version 12.0.3
+
+- nlohmann-json `3.6.1` -> `3.7.0`
+    - [(#7459)](https://github.com/microsoft/vcpkg/pull/7459) [nlohmann-json] Update to 3.7.0
+
+- ecm `5.58.0` -> `5.60.0-1`
+    - [(#7457)](https://github.com/microsoft/vcpkg/pull/7457) [ecm] Update library to v5.60.0
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- gl2ps `1.4.0-1` -> `1.4.0-3`
+    - [(#7453)](https://github.com/microsoft/vcpkg/pull/7453) [gl2ps]Update to use vcpkg new functions(vcpkg_from_gitlab).
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- darknet `0.2.5-4` -> `0.2.5-5`
+    - [(#7450)](https://github.com/microsoft/vcpkg/pull/7450) [darknet] add training feature
+
+- g3log `2019-05-14-1` -> `2019-07-29`
+    - [(#7448)](https://github.com/microsoft/vcpkg/pull/7448) [g3log] Fix https://github.com/KjellKod/g3log/issues/319
+
+- azure-storage-cpp `6.1.0` -> `6.1.0-2`
+    - [(#7404)](https://github.com/microsoft/vcpkg/pull/7404) [azure-storage-cpp] Removed gcov dependency in debug Linux build (#7311)
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- ace `6.5.5-1` -> `6.5.6`
+    - [(#7466)](https://github.com/microsoft/vcpkg/pull/7466) [ace] ace 6.5.6
+
+- bullet3 `2.88` -> `2.88-1`
+    - [(#7474)](https://github.com/microsoft/vcpkg/pull/7474) [Bullet3] feature for multithreading
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- alembic `1.7.11-2` -> `1.7.11-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- ampl-mp `2019-03-21` -> `2019-03-21-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- anax `2.1.0-5` -> `2.1.0-6`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- apr `1.6.5-1` -> `1.6.5-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- blosc `1.16.3-1` -> `1.16.3-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- capnproto `0.7.0-2` -> `0.7.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- cgicc `3.2.19-1` -> `3.2.19-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- charls `2.0.0-1` -> `2.0.0-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- collada-dom `2.5.0-1` -> `2.5.0-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- ctemplate `2017-06-23-44b7c5-3` -> `2017-06-23-44b7c5-4`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- dlfcn-win32 `1.1.1-1` -> `1.1.1-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- easyloggingpp `9.96.7` -> `9.96.7-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- fastfeat `391d5e9` -> `391d5e9-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- fastlz `1.0-2` -> `1.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- freeglut `3.0.0-6` -> `3.0.0-7`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- glbinding `3.1.0-1` -> `3.1.0-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- glew `2.1.0-4` -> `2.1.0-5`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- glfw3 `3.3` -> `3.3-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- graphicsmagick `1.3.32` -> `1.3.32-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- hypre `2.11.2-1` -> `2.11.2-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- jack2 `1.9.12-1` -> `1.9.12-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- jxrlib `1.1-7` -> `1.1-8`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- kangaru `4.1.3-1` -> `4.1.3-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libconfig `1.7.2` -> `1.7.2-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libfreenect2 `0.2.0-2` -> `0.2.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libmad `0.15.1-2` -> `0.15.1-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libmspack `0.10.1` -> `0.10.1-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libnice `0.1.15` -> `0.1.15-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libodb-boost `2.4.0-2` -> `2.4.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libodb-mysql `2.4.0-2` -> `2.4.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libodb-pgsql `2.4.0-2` -> `2.4.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libodb-sqlite `2.4.0-3` -> `2.4.0-4`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libodb `2.4.0-4` -> `2.4.0-5`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- librabbitmq `0.9.0` -> `0.9.0-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libsamplerate `0.1.9.0` -> `0.1.9.0-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- libwebsockets `3.1.0-2` -> `3.1.0-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- lmdb `0.9.23-1` -> `0.9.23-2`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- mozjpeg `3.2-2` -> `3.2-3`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- nanodbc `2.12.4-3` -> `2.12.4-4`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- nmslib `1.7.3.6` -> `1.7.3.6-1`
+    - [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
+
+- amqpcpp `4.1.4` -> `4.1.5`
+    - [(#7475)](https://github.com/microsoft/vcpkg/pull/7475) [amqpcpp] Update library to v4.1.5
+
+- cxxopts `2.1.2-1` -> `2.2.0`
+    - [(#7473)](https://github.com/microsoft/vcpkg/pull/7473) [cxxopts] Bumped to v2.2.0
+
+- boost-mpi `1.70.0-1` -> `1.70.0-2`
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- hdf5 `1.10.5-7` -> `1.10.5-8`
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- kealib `1.4.11` -> `1.4.11-1`
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- parmetis `4.0.3-2` -> `4.0.3-3`
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+- vtk `8.2.0-4` -> `8.2.0-5`
+    - [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
+
+</details>
+
+-- vcpkg team vcpkg@microsoft.com THU, 01 Aug 07:00:00 -0800
+
 vcpkg (2019.6.30)
 ---
 #### Total port count: 1068
@ -7,8 +629,8 @@ vcpkg (2019.6.30)
 |**x64-windows**|1006|
 |x86-windows|977|
 |x64-windows-static|895|
-|**x64-osx**|823|
-|**x64-linux**|755|
+|**x64-osx**|755|
+|**x64-linux**|823|
 |arm64-windows|654|
 |x64-uwp|532|
 |arm-uwp|504|
--- a/NOTICE.txt
+++ b/NOTICE.txt
@ -0,0 +1,46 @@
+vcpkg uses third party material from the projects listed below.
+The original copyright notice and the license under which Microsoft
+received such third party material are set forth below. Microsoft
+reserves all other rights not expressly granted, whether by
+implication, estoppel or otherwise.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention by posting an issue.
+
+THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
+Do Not Translate or Localize
+
+vcpkg incorporates third party material from the projects listed below.
+The original copyright notice and the license under which Microsoft received
+such third party materials are set forth below. Microsoft reserved all other
+rights not expressly granted, whether by implication, estoppel or otherwise.
+
+1.  Catch2
+
+%% Catch2 NOTICES, INFORMATION, AND LICENSE BEGIN HERE
+=========================================
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+=========================================
+END OF Catch2 NOTICES, INFORMATION, AND LICENSE
--- a/docs/examples/overlay-triplets-linux-dynamic.md
+++ b/docs/examples/overlay-triplets-linux-dynamic.md
@ -1,66 +1,41 @@
-# Overlay triplets example: build dynamic libraries on Linux
+# Overlay triplets example

-Using **vcpkg** you can build libraries for the following triplets:
+## Building dynamic libraries on Linux

-<div>
-    <ul style="columns: 3;">
-        <li> arm-uwp</li>
-        <li> arm-windows</li>
-        <li> arm64-uwp</li>
-        <li> arm64-windows</li>
-        <li> x86-uwp</li>
-        <li> x86-windows</li>
-        <li> x86-windows-static</li>
-        <li> x64-uwp</li>
-        <li> x64-linux</li>
-        <li> x64-osx</li>
-        <li> x64-windows</li>
-        <li> x64-windows-static</li>
-    </ul>
-</div>
+Using **vcpkg** you can build libraries for many configurations out of the box. However, this doesn't currently include shared libraries on Linux and Mac OS.

+This doesn't mean that you cannot use **vcpkg** to build your dynamic libraries on these platforms! This document will guide you through creating your own custom triplets with `--overlay-triplets` to easily build dynamic libraries on Linux.

-
-By design **vcpkg** builds only static libraries for Linux and Mac OS.
-However, this doesn't mean that you cannot use **vcpkg** to build your dynamic libraries on these platforms.
-
-This document will guide you through creating your own custom triplets to build dynamic libraries on Linux using **vcpkg**.
-
-### Step 1: Create a folder to contain your custom triplets
-
-```
-~/vcpkg$ mkdir ../custom-triplets
-```
-
-### Step 2: Create the custom triplet files
+### Step 1: Create the custom triplet files

 To save time, copy the existing `x64-linux.cmake` triplet file.

-```
-~/vcpkg$ cp ./triplets/x64-linux.cmake ../custom-triplets/x64-linux-dynamic.cmake
+```sh
+~/git$ mkdir custom-triplets
+~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-dynamic.cmake
 ```

 And modify `custom-triplets/x64-linux-dynamic.cmake` to match the contents below:
-```
+```cmake
+# ~/git/custom-triplets/x64-linux-dynamic.cmake
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
-# Change VCPKG_LIBRARY_LINKAGE from static to dynamic
-set(VCPKG_LIBRARY_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic) # This changed from static to dynamic

 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 ```

-### Step 3: Use `--overlay-triplets` to build dynamic libraries
+### Step 2: Use `--overlay-triplets` to build dynamic libraries

 Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory. 

 ```
-./vcpkg install sqlite3:x64-linux-dynamic --overlay-triplets=../custom-triplets
+~/git$ vcpkg/vcpkg install sqlite3:x64-linux-dynamic --overlay-triplets=custom-triplets
 The following packages will be built and installed:
-    sqlite3[core]:x64-linux
+    sqlite3[core]:x64-linux-dynamic
 Starting package 1/1: sqlite3:x64-linux-dynamic
 Building package sqlite3[core]:x64-linux-dynamic...
-- Loading triplet configuration from: /home/custom-triplets/x64-linux-dynamic.cmake
+-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux-dynamic.cmake
 -- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip...
 -- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip
 -- Applying patch fix-arm-uwp.patch
@ -84,7 +59,7 @@ The package sqlite3:x64-linux-dynamic provides CMake targets:
    target_link_libraries(main PRIVATE sqlite3)
 ```

-Overlay triplets will add your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.
+Overlay triplets enables your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.

 When using the `--overlay-triplets` option, a message like the following lets you know that a custom triplet is being used: 

@ -94,40 +69,33 @@ When using the `--overlay-triplets` option, a message like the following lets yo

 ## Overriding default triplets

-As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is inconsistent with Linux and Mac OS where only static libraries are built.
+As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is different with Linux and Mac OS where static libraries are built by `x64-linux` and `x64-osx`.

 Using `--overlay-ports` it is possible to override the default triplets to accomplish the same behavior on Linux:

 * `x64-linux`: Builds dynamic libraries,
 * `x64-linux-static`: Builds static libraries.

-### Step 1: Create the overriden triplet
+### Step 1: Create the overlay triplets

-Using the custom triplet created in the previous example, rename `custom-triplets/x64-linux-dynamic.cmake` to `custom-triplets/x64-linux.cmake`.
+Using the custom triplet created in the previous example, rename `custom-triplets/x64-linux-dynamic.cmake` to `custom-triplets/x64-linux.cmake`. Then, copy the default `x64-linux` triplet (which builds static libraries) in your `custom-triplets` folder and rename it to `x64-linux-static.cmake`.

-```
-~/vcpkg$ mv ../custom-triplets/x64-linux-dynamic.cmake ../custom-triplets/x64-linux.cmake
+```sh
+~/git$ mv custom-triplets/x64-linux-dynamic.cmake custom-triplets/x64-linux.cmake
+~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-static.cmake
 ```

-### Step 2: Copy and rename the default triplet
-
-Then, copy the default `x64-linux` triplet (which builds static libraries) in your `/custom-triplets` folder and rename it to `x64-linux-static.cmake`.
-
-```
-~/vcpkg$ cp ./triplets/x64-linux.cmake ../custom-triplets/x64-linux-static.cmake
-```
-
-### Step 3: Use `--overlay-ports` to override default triplets
+### Step 2: Use `--overlay-ports` to override default triplets

 Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory.

 ```
-./vcpkg install sqlite3:x64-linux --overlay-triplets=../custom-triplets
+~/git$ vcpkg/vcpkg install sqlite3:x64-linux --overlay-triplets=custom-triplets
 The following packages will be built and installed:
    sqlite3[core]:x64-linux
 Starting package 1/1: sqlite3:x64-linux
 Building package sqlite3[core]:x64-linux...
-- Loading triplet configuration from: /home/custom-triplets/x64-linux.cmake
+-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake
 -- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip...
 -- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip
 -- Applying patch fix-arm-uwp.patch
@ -154,5 +122,5 @@ The package sqlite3:x64-linux provides CMake targets:
 Note that the default triplet is masked by your custom triplet:

 ```
-- Loading triplet configuration from: /home/custom-triplets/x64-linux.cmake
+-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake
 ```
--- a/docs/index.md
+++ b/docs/index.md
@ -21,6 +21,11 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too
 - [Portfile functions](maintainers/portfile-functions.md)
 - [Maintainer Guidelines](maintainers/maintainer-guide.md)

+### Tool Maintainer Help
+
+- [Testing](tool-maintainers/testing.md)
+- [Maintainer Guidelines](maintainers/maintainer-guide.md)
+
 ### Specifications

 - [Export](specifications/export-command.md)
--- a/docs/maintainers/maintainer-guide.md
+++ b/docs/maintainers/maintainer-guide.md
@ -34,7 +34,7 @@ At this time, the following helpers are deprecated:

 ### Avoid excessive comments in portfiles

-Ideally, portfiles should be short, simple, and as declarative as possible. Remove any helper comments introduced by the `create` command before submitting a PR.
+Ideally, portfiles should be short, simple, and as declarative as possible. Remove any boiler plate comments introduced by the `create` command before submitting a PR.

 ## Build Techniques

@ -85,6 +85,15 @@ vcpkg_configure_cmake(

 Note that `ZLIB` in the above is case-sensitive. See the [cmake documentation](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) for more details.

+### Place conflicting libs in a `manual-link` directory
+
+A lib is considered conflicting if it does any of the following:
+ Define `main`
+ Define malloc
+ Define symbols that are also declared in other libraries
+
+Conflicting libs are typically by design and not considered a defect.  Because some build systems link against everything in the lib directory, these should be moved into a subdirectory named `manual-link`.
+
 ## Versioning

 ### Follow common conventions for the `Version:` field
@ -157,7 +166,7 @@ While `portfile.cmake`'s and `CMakeLists.txt`'s share a common syntax and core C

 Portfiles have direct access to variables set in the triplet file, but `CMakeLists.txt`s do not (though there is often a translation that happens -- `VCPKG_LIBRARY_LINKAGE` versus `BUILD_SHARED_LIBS`).

-Finally, portfiles and CMake builds invoked by portfiles are run in different processes. Conceptually:
+Portfiles and CMake builds invoked by portfiles are run in different processes. Conceptually:

 ```no-highlight
 +----------------------------+       +------------------------------------+
--- a/docs/maintainers/portfile-functions.md
+++ b/docs/maintainers/portfile-functions.md
@ -24,4 +24,5 @@
 - [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md)
 - [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
 - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
+- [vcpkg\_prettify\_command](vcpkg_prettify_command.md)
 - [vcpkg\_test\_cmake](vcpkg_test_cmake.md)
--- a/docs/maintainers/vcpkg_check_features.md
+++ b/docs/maintainers/vcpkg_check_features.md
@ -1,71 +1,148 @@
 # vcpkg_check_features
-
-Check if one or more features are a part of the package installation.
+Check if one or more features are a part of a package installation.

 ## Usage
 ```cmake
 vcpkg_check_features(
-    <feature1> <output_variable1>
-    [<feature2> <output_variable2>]
-    ...
+  OUT_FEATURE_OPTIONS <FEATURE_OPTIONS>  
+  [FEATURES
+    <cuda> <WITH_CUDA>
+    [<opencv> <WITH_OPENCV>]
+    ...]
+  [INVERTED_FEATURES
+    <cuda> <IGNORE_PACKAGE_CUDA>
+    [<opencv> <IGNORE_PACKAGE_OPENCV>]
+    ...]
 )
 ```
+`vcpkg_check_features()` accepts these parameters: 

-`vcpkg_check_features` accepts a list of (feature, output_variable) pairs. If a feature is specified, the corresponding output variable will be set as `ON`, or `OFF` otherwise. The syntax is similar to the `PROPERTIES` argument of `set_target_properties`.
+* `OUT_FEATURE_OPTIONS`:  
+  An output variable, the function will clear the variable passed to `OUT_FEATURE_OPTIONS` 
+  and then set it to contain a list of option definitions (`-D<OPTION_NAME>=ON|OFF`).
+  
+  This should be set to `FEATURE_OPTIONS` by convention.
+  
+* `FEATURES`:  
+  A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs.  
+  For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of:   
+    
+    * `-D<OPTION_NAME>=ON`, if a feature is specified for installation,
+    * `-D<OPTION_NAME>=OFF`, otherwise. 
+
+* `INVERTED_FEATURES`:  
+  A list of (`FEATURE_NAME`, `OPTION_NAME`) pairs, uses reversed logic from `FEATURES`.  
+  For each `FEATURE_NAME` a definition is added to `OUT_FEATURE_OPTIONS` in the form of:   
+    
+    * `-D<OPTION_NAME>=OFF`, if a feature is specified for installation,
+    * `-D<OPTION_NAME>=ON`, otherwise. 

-`vcpkg_check_features` will create a variable `FEATURE_OPTIONS` in the parent scope, which you can pass as a part of `OPTIONS` argument when calling functions like `vcpkg_config_cmake`:
-```cmake
-vcpkg_config_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DBUILD_TESTING=ON
-        ${FEATURE_OPTIONS}
-)
-```

 ## Notes
-```cmake
-vcpkg_check_features(<feature> <output_variable>)
-```
-can be used as a replacement of:
-```cmake
-if(<feature> IN_LIST FEATURES)
-    set(<output_variable> ON)
-else()
-    set(<output_variable> OFF)
-endif()
-```

-However, if you have a feature that was checked like this before:
-```cmake
-if(<feature> IN_LIST FEATURES)
-    set(<output_variable> OFF)
-else()
-    set(<output_variable> ON)
-endif()
-```
-then you should not use `vcpkg_check_features` instead. [```oniguruma```](https://github.com/microsoft/vcpkg/blob/master/ports/oniguruma/portfile.cmake), for example, has a feature named `non-posix` which is checked with:
-```cmake
-if("non-posix" IN_LIST FEATURES)
-    set(ENABLE_POSIX_API OFF)
-else()
-    set(ENABLE_POSIX_API ON)
-endif()
-```
-and by replacing these code with:
-```cmake
-vcpkg_check_features(non-posix ENABLE_POSIX_API)
-```
-is totally wrong.
+The `FEATURES` name parameter can be omitted if no `INVERTED_FEATURES` are used.
+
+At least one (`FEATURE_NAME`, `OPTION_NAME`) pair must be passed to the function call.
+
+Arguments passed to `FEATURES` and `INVERTED_FEATURES` are not validated to prevent duplication.  
+If the same (`FEATURE_NAME`, `OPTION_NAME`) pair is passed to both lists, 
+two conflicting definitions are added to `OUT_FEATURE_OPTIONS`.

-`vcpkg_check_features` is supposed to be called only once. Otherwise, the `FEATURE_OPTIONS` variable set by a previous call will be overwritten.

 ## Examples

-* [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake)
-* [xsimd](https://github.com/microsoft/vcpkg/blob/master/ports/xsimd/portfile.cmake)
-* [xtensor](https://github.com/microsoft/vcpkg/blob/master/ports/xtensor/portfile.cmake)
+### Example 1: Regular features
+
+```cmake
+$ ./vcpkg install mimalloc[asm,secure]
+
+# ports/mimalloc/portfile.cmake
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  # Keyword FEATURES is optional if INVERTED_FEATURES are not used
+    asm       MI_SEE_ASM
+    override  MI_OVERRIDE
+    secure    MI_SECURE
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    # Expands to "-DMI_SEE_ASM=ON; -DMI_OVERRIDE=OFF; -DMI_SECURE=ON"
+    ${FEATURE_OPTIONS}
+)
+```
+
+### Example 2: Inverted features
+
+```cmake
+$ ./vcpkg install cpprestsdk[websockets]
+
+# ports/cpprestsdk/portfile.cmake
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  INVERTED_FEATURES # <- Keyword INVERTED_FEATURES required
+    brotli      CPPREST_EXCLUDE_BROTLI
+    websockets  CPPREST_EXCLUDE_WEBSOCKETS
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON; -DCPPREST_EXCLUDE_WEBSOCKETS=OFF"
+    ${FEATURE_OPTIONS}
+)
+```
+
+### Example 3: Set multiple options for same feature
+
+```cmake
+$ ./vcpkg install pcl[cuda]
+
+# ports/pcl/portfile.cmake
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    cuda  WITH_CUDA
+    cuda  BUILD_CUDA
+    cuda  BUILD_GPU
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    # Expands to "-DWITH_CUDA=ON; -DBUILD_CUDA=ON; -DBUILD_GPU=ON"
+    ${FEATURE_OPTIONS}
+)
+``` 
+
+### Example 4: Use regular and inverted features
+
+```cmake
+$ ./vcpkg install rocksdb[tbb]
+
+# ports/rocksdb/portfile.cmake
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used
+    tbb   WITH_TBB
+  INVERTED_FEATURES
+    tbb   ROCKSDB_IGNORE_PACKAGE_TBB
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    # Expands to "-DWITH_TBB=ON; -DROCKSDB_IGNORE_PACKAGE_TBB=OFF"
+    ${FEATURE_OPTIONS}
+)
+``` 
+
+## Examples in portfiles
+
+* [cpprestsdk](https://github.com/microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake)
+* [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake)
+* [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake)
+

 ## Source
 [scripts/cmake/vcpkg_check_features.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_features.cmake)
--- a/docs/maintainers/vcpkg_configure_cmake.md
+++ b/docs/maintainers/vcpkg_configure_cmake.md
@ -18,14 +18,15 @@ vcpkg_configure_cmake(

 ## Parameters
 ### SOURCE_PATH
-Specifies the directory containing the `CMakeLists.txt`. By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.
+Specifies the directory containing the `CMakeLists.txt`.
+By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.

 ### PREFER_NINJA
-Indicates that, when available, Vcpkg should use Ninja to perform the build. This should be specified unless the port is known to not work under Ninja.
+Indicates that, when available, Vcpkg should use Ninja to perform the build.
+This should be specified unless the port is known to not work under Ninja.

 ### DISABLE_PARALLEL_CONFIGURE
 Disables running the CMake configure step in parallel.
-
 This is needed for libraries which write back into their source directory during configure.

 ### NO_CHARSET_FLAG
@ -36,7 +37,8 @@ This is needed for libraries that set their own source code's character set.
 ### GENERATOR
 Specifies the precise generator to use.

-This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. If used for this purpose, it should be set to "NMake Makefiles".
+This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build.
+If used for this purpose, it should be set to "NMake Makefiles".

 ### OPTIONS
 Additional options passed to CMake during the configuration.
--- a/docs/maintainers/vcpkg_prettify_command.md
+++ b/docs/maintainers/vcpkg_prettify_command.md
@ -0,0 +1,17 @@
+# vcpkg_prettify_command
+
+Turns list of command arguments into a formatted string.
+
+## Usage
+```cmake
+vcpkg_prettify_command()
+```
+
+## Examples
+
+* `scripts/cmake/vcpkg_execute_build_process.cmake`
+* `scripts/cmake/vcpkg_execute_required_process.cmake`
+* `scripts/cmake/vcpkg_execute_required_process_repeat.cmake`
+
+## Source
+[scripts/cmake/vcpkg_prettify_command.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_prettify_command.cmake)
--- a/docs/tool-maintainers/testing.md
+++ b/docs/tool-maintainers/testing.md
@ -0,0 +1,162 @@
+Testing
+=======
+
+Testing vcpkg is important whenever one makes changes to the tool itself, and
+writing new tests and keeping them up to date is also very important. If one's
+code is subtly broken, we'd rather find it out right away than a few weeks down
+the line when someone complains!
+
+Running Tests
+-------------
+
+Before anything else, we should know whether you can actually run the tests!
+All you should need is a way to build vcpkg -- anything will do! All you have to
+do is follow the guide 😄
+
+With `$VCPKG_DIRECTORY` being the directory where you have cloned vcpkg, create
+a build directory in `$VCPKG_DIRECTORY/toolsrc` (commonly named `out`), and
+`cd` into it. Make sure to clean it out if it already exists!
+
+```sh
+$ cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja
+$ cmake --build .
+$ ./vcpkg-test # ./vcpkg-test [$SPECIFIC_TEST] for a specific set of tests
+$ # i.e., ./vcpkg-test [arguments]
+```
+
+If you make any modifications to `vcpkg`, you'll have to do the
+`cmake --build .` step again.
+
+Writing Tests
+-------------
+
+In your journey to write new tests, and to modify existing tests, reading the
+[Catch2 documentation] will be very helpful! Come back after reading those 😀
+
+You'll want to place your tests in one of the existing files, or, if it doesn't
+belong in any of those, in a [new file](#adding-new-test-files).
+
+The layout of these tests is as follows:
+
+```cpp
+// ... includes
+
+TEST_CASE("Name of test", "[filename without the .cpp]") {
+  // setup and the like
+  REQUIRE(some boolean expression);
+}
+
+// etc.
+```
+
+You want to give these test cases good, descriptive, unique names, like
+`SourceParagraph construct minimum` -- it doesn't need to be extremely clear
+english, and shorthand is good, but make sure it's clear what the test is from
+the name. For the latter parameter, known as "tags", you should at least put the
+name of the file which the test case is in -- e.g., in `arguments.cpp`, you'd
+tag all of the test cases with `[arguments]`.
+
+If you wish to add helper functions, make sure to place them in an anonymous
+namespace -- this will ensure that they don't trample over anybody else's
+space. Additionally, there are a few helper functions that live in
+`<vcpkg-test/util.h>` and `src/vcpkg-test/util.cpp` -- make sure to look into
+them so that you're not rewriting functionality.
+
+That should be all you need to know to start writing your own tests!
+Remember to check out the [Catch2 documentation]
+if you'd like to get more advanced with your tests,
+and good luck on your testing journey!
+
+Adding New Test Files
+---------------------
+
+Adding new test files should be easy and straightforward. All it requires is
+creating a new source file in `toolsrc/src/vcpkg-test`, and then rerunning
+`CMake` in order to pick up the glob changes.
+
+### Example
+
+Let's try writing a new test file called `example` (very creative, I know).
+
+First, we should create a file, `example.cpp`, in `toolsrc/src/vcpkg-test`:
+
+```cpp
+// vcpkg-test/example.cpp
+#include <vcpkg-test/catch.h>
+```
+
+This is the minimum file needed for tests; let's rebuild our CMake directory.
+You'll have to clean out the existing `out` directory for CMake to rerun
+globbing.
+
+```sh
+$ cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja
+# ...
+-- Build files have been written to: $VCPKG_DIRECTORY/toolsrc/out
+$ cmake --build .
+[80/80] Linking CXX executable vcpkg.exe
+```
+
+Okay, now let's make sure this worked; add a test case to `example.cpp`:
+
+```cpp
+TEST_CASE("Example 1 - fail", "[example]") {
+  REQUIRE(false);
+}
+```
+
+Now build the tests again, and run them:
+
+```sh
+$ cmake --build .
+[2/2] Linking CXX executable vcpkg-test.exe
+$ ./vcpkg-test
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+vcpkg-test.exe is a Catch v2.9.1 host application.
+Run with -? for options
+
+-------------------------------------------------------------------------------
+Example 1 - fail
+-------------------------------------------------------------------------------
+$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(3)
+...............................................................................
+
+$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(14): FAILED:
+  REQUIRE( false )
+
+===============================================================================
+test cases:  102 |  101 passed | 1 failed
+assertions: 3611 | 3610 passed | 1 failed
+```
+
+Hopefully, that worked! It should compile correctly, and have one failing test.
+Now let's try a more complex test, after deleting the old one;
+
+```cpp
+// add #include <vcpkg/base/strings.h> to the top of the file
+namespace Strings = vcpkg::Strings;
+
+TEST_CASE("Example 2 - success", "[example]") {
+  std::string hello = "Hello";
+  REQUIRE(Strings::case_insensitive_ascii_equals(hello, "hELLo"));
+  REQUIRE_FALSE(Strings::case_insensitive_ascii_starts_with(hello, "E"));
+}
+```
+
+Now compile and build the tests, and this time let's only run our example tests:
+
+```sh
+$ cmake --build .
+[2/2] Linking CXX executable vcpkg-test.exe
+$ ./vcpkg-test [example]
+Filters: [example]
+===============================================================================
+All tests passed (2 assertions in 1 test case)
+```
+
+Hopefully you have one test running and succeeding! If you have that, you have
+succeeded at adding a new file to vcpkg's tests. Congratulations! Have fun on
+the rest of your journey 🐱‍👤😁
+
+[Catch2 documentation]: https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md#top
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,5 +1,5 @@
 Source: ace
-Version: 6.5.5-1
+Version: 6.5.6
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
 Description: The ADAPTIVE Communication Environment

--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@ -28,9 +28,9 @@ set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
 set(ENV{ACE_ROOT} ${ACE_ROOT})
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_5/ACE-src-6.5.5.zip"
-    FILENAME ACE-src-6.5.5.zip
-    SHA512 65696e6f2776fd9c015adb78a92f1c87edacde62ff11f20f88c416d4420a6fc6e5176412c5f93262d06e67b89717499f8108f68582f70fea6ce05466c53415e9
+    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
+    FILENAME ACE-src-6.5.6.zip
+    SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/ade/CONTROL
+++ b/ports/ade/CONTROL
@ -1,3 +1,3 @@
 Source: ade
-Version: 0.1.1d
+Version: 0.1.1f
 Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.
--- a/ports/ade/portfile.cmake
+++ b/ports/ade/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO opencv/ade
-    REF v0.1.1d
-    SHA512 c493cb57e59ba859ca0cbf5d48bae4233f22104dfb4a96864d07e9422bb700c27af2d53a602f2230d68b7bcc598920d0652c3d9fdf8fad94a7e5b4d21664a44e
+    REF v0.1.1f
+    SHA512 fbdec8f3d5811a573abb81f1ceb6fb8d40274439013f749645db5430c6d9cdc52227c25203f1a68177b263d648bb65197ea7c2bea7871264a06585e59892631c
    HEAD_REF master
 )

--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,5 +1,5 @@
 Source: alembic
-Version: 1.7.11-2
+Version: 1.7.11-4
 Build-Depends: ilmbase, hdf5
 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
 Homepage: https://alembic.io/
--- a/ports/alembic/bypass-findhdf5.patch
+++ b/ports/alembic/bypass-findhdf5.patch
@ -1,30 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce0a8e0..229fc77 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -226,7 +226,24 @@ INCLUDE_DIRECTORIES(${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY})
- IF (USE_HDF5)
-     FIND_PACKAGE(ZLIB REQUIRED)
-     SET(ALEMBIC_WITH_HDF5 "1")
-    INCLUDE("./cmake/AlembicHDF5.cmake")
-+    #INCLUDE("./cmake/AlembicHDF5.cmake")
-+    FIND_LIBRARY(HDF5_LIBRARIES_RELEASE
-+        NAMES hdf5
-+        PATHS ${HDF5_ROOT}/lib
-+        )
-+    MESSAGE(STATUS ${HDF5_LIBRARIES_RELEASE})
-+    FIND_LIBRARY(HDF5_LIBRARIES_DEBUG
-+        NAMES hdf5_D
-+        PATHS ${HDF5_ROOT}/debug/lib
-+        )
-+    MESSAGE(STATUS ${HDF5_LIBRARIES_DEBUG})
-+    SET(HDF5_LIBRARIES
-+        optimized ${HDF5_LIBRARIES_RELEASE}
-+        debug ${HDF5_LIBRARIES_DEBUG}
-+        )
-+    SET(HDF5_INCLUDE_DIRS
-+        ${HDF5_ROOT}/include
-+        )
-     INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS})
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API")
- ENDIF()
--- a/ports/alembic/fix-hdf5link.patch
+++ b/ports/alembic/fix-hdf5link.patch
@ -1,17 +0,0 @@
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 5028c91..1f81d50 100644
--- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -49,6 +49,12 @@ ADD_SUBDIRECTORY(AbcMaterial)
- ADD_SUBDIRECTORY(Ogawa)
- 
- ADD_LIBRARY(Alembic ${LIB_TYPE} ${CXX_FILES})
-+IF (USE_HDF5)
-+    TARGET_LINK_LIBRARIES(Alembic 
-+        ${HDF5_LIBRARIES}
-+        )
-+    ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
-+ENDIF()
- 
- TARGET_INCLUDE_DIRECTORIES(Alembic
-     PUBLIC
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@ -16,16 +16,14 @@ vcpkg_from_github(
    SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
    HEAD_REF master
    PATCHES
-        fix-hdf5link.patch
-        bypass-findhdf5.patch
        fix-C1083.patch
 )

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
    -DUSE_HDF5=ON
-    -DHDF5_ROOT=${CURRENT_INSTALLED_DIR}
 )

 vcpkg_install_cmake()
--- a/ports/ampl-mp/CONTROL
+++ b/ports/ampl-mp/CONTROL
@ -1,3 +1,3 @@
 Source: ampl-mp
-Version: 2019-03-21
+Version: 2019-03-21-1
 Description: An open-source library for mathematical programming
--- a/ports/ampl-mp/portfile.cmake
+++ b/ports/ampl-mp/portfile.cmake
@ -20,6 +20,7 @@ vcpkg_from_github(

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
    -DBUILD=asl
    -DBUILD_TESTING=OFF
--- a/ports/amqpcpp/CONTROL
+++ b/ports/amqpcpp/CONTROL
@ -1,4 +1,4 @@
 Source: amqpcpp
-Version: 4.1.4
+Version: 4.1.5
 Description: AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
 Build-Depends: openssl (linux)
--- a/ports/amqpcpp/portfile.cmake
+++ b/ports/amqpcpp/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CopernicaMarketingSoftware/AMQP-CPP
-    REF v4.1.4
-    SHA512 d589756ad8e27ce6b6772128479083293c4dbb8c7aa79b7b08f0036ced9ab76ecb75e55458f04de8e2745c9732a6322f4e910f3f8611633c5cd5c35fb7dcaed1
+    REF v4.1.5
+    SHA512 71c54ddf43230fb3e9726257b073d117a329030052f768f985c2e9ebde5a320f0042d2ef67604b87940bfa1ed61339c334af0362238d10f30845521dff8ce43c
    HEAD_REF master
    PATCHES
        find-openssl.patch
--- a/ports/anax/CONTROL
+++ b/ports/anax/CONTROL
@ -1,4 +1,4 @@
 Source: anax
-Version: 2.1.0-5
+Version: 2.1.0-6
 Description: An open source C++ entity system.
 Homepage: https://github.com/miguelmartin75/anax
--- a/ports/anax/portfile.cmake
+++ b/ports/anax/portfile.cmake
@ -14,6 +14,7 @@ vcpkg_from_github(

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    DISABLE_PARALLEL_CONFIGURE
 )

--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@ -1,5 +1,5 @@
 Source: apr
-Version: 1.6.5-1
+Version: 1.6.5-2
 Homepage: https://apr.apache.org/
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.

--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@ -22,6 +22,7 @@ endif()

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
        -DINSTALL_PDB=OFF
        -DMIN_WINDOWS_VER=Windows7
--- a/ports/argh/CONTROL
+++ b/ports/argh/CONTROL
@ -1,3 +1,3 @@
 Source: argh
-Version: 2018-12-18
+Version: 2018-12-18-1
 Description: Argh! A minimalist argument handler.
--- a/ports/argh/portfile.cmake
+++ b/ports/argh/portfile.cmake
@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
    OPTIONS
        -DBUILD_TESTS=OFF
        -DBUILD_EXAMPLES=OFF
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@ -1,4 +1,4 @@
 Source: armadillo
-Version: 2019-04-16-3
+Version: 2019-04-16-4
 Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
 Build-Depends: openblas (!osx), clapack (!osx)
--- a/ports/armadillo/fix-CMakePath.patch
+++ b/ports/armadillo/fix-CMakePath.patch
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fea721..e6a273d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -473,7 +473,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION
+ # and install it
+ set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ set(ARMADILLO_LIB_DIR      "${CMAKE_INSTALL_FULL_LIBDIR}")
+-set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo/CMake")
+set(ARMADILLO_CMAKE_DIR    "${CMAKE_INSTALL_FULL_DATADIR}/Armadillo")
+ 
+ 
+ message(STATUS "Generating '${PROJECT_BINARY_DIR}/InstallFiles/ArmadilloConfig.cmake'")
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@ -11,6 +11,7 @@ vcpkg_from_gitlab(
    HEAD_REF 9.400.x
    PATCHES
        remove_custom_modules.patch
+		fix-CMakePath.patch
 )

 file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake)
@ -31,6 +32,13 @@ vcpkg_copy_pdbs()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo)

+file(GLOB SHARE_CONTENT ${CURRENT_PACKAGES_DIR}/share/Armadillo)
+list(LENGTH SHARE_CONTENT SHARE_LEN)
+if(SHARE_LEN EQUAL 0)
+    # On case sensitive file system there is an extra empty directory created that should be removed
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo)
+endif()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo)
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt  DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright)
--- a/ports/armadillo/usage
+++ b/ports/armadillo/usage
@ -0,0 +1,4 @@
+The package armadillo provides CMake targets:
+
+    find_package(Armadillo CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE ${ARMADILLO_LIBRARIES})
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@ -1,5 +1,5 @@
 Source: arrow
-Version: 0.13.0-4
+Version: 0.14.1
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
 Homepage: https://github.com/apache/arrow
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@ -1,120 +1,21 @@
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 52081c4..e1e13b5 100644
--- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -804,6 +804,9 @@ if(ARROW_USE_GLOG)
-   list(APPEND ARROW_LINK_LIBS GLOG::glog)
-   list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog)
-   list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS GLOG::glog)
-+  if(ARROW_NEED_GFLAGS)
-+    list(APPEND ARROW_STATIC_LINK_LIBS gflags::gflags)
-+  endif()
-   add_definitions("-DARROW_USE_GLOG")
- endif()
+diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
+index 4ef2948..9c3c121 100644
+--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
+@@ -305,7 +305,7 @@ function(ADD_ARROW_LIB LIB_NAME)
+       target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
+     endif()
 
-diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
-index e1429a2..6dee036 100644
--- a/cpp/cmake_modules/FindBrotli.cmake
-+++ b/cpp/cmake_modules/FindBrotli.cmake
-@@ -18,6 +18,7 @@
- #  find_package(Brotli)
- 
- pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec)
-+
- if(BROTLI_PC_FOUND)
-   set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}")
- 
-@@ -25,80 +26,16 @@ if(BROTLI_PC_FOUND)
-   list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlicommon_LIBDIR}")
-   list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlienc_LIBDIR}")
-   list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlidec_LIBDIR}")
-
-  find_library(BROTLI_COMMON_LIBRARY brotlicommon
-               PATHS ${BROTLI_PC_LIBRARY_DIRS}
-               NO_DEFAULT_PATH)
-  find_library(BROTLI_ENC_LIBRARY brotlienc
-               PATHS ${BROTLI_PC_LIBRARY_DIRS}
-               NO_DEFAULT_PATH)
-  find_library(BROTLI_DEC_LIBRARY brotlidec
-               PATHS ${BROTLI_PC_LIBRARY_DIRS}
-               NO_DEFAULT_PATH)
- elseif(BROTLI_ROOT)
-  find_library(
-    BROTLI_COMMON_LIBRARY
-    NAMES brotlicommon
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-    PATH_SUFFIXES "lib64" "lib" "bin"
-    NO_DEFAULT_PATH)
-  find_library(
-    BROTLI_ENC_LIBRARY
-    NAMES brotlienc
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-    PATH_SUFFIXES "lib64" "lib" "bin"
-    NO_DEFAULT_PATH)
-  find_library(
-    BROTLI_DEC_LIBRARY
-    NAMES brotlidec
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-    PATH_SUFFIXES "lib64" "lib" "bin"
-    NO_DEFAULT_PATH)
-  find_path(BROTLI_INCLUDE_DIR
-            NAMES brotli/decode.h
-            PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-            NO_DEFAULT_PATH
-            PATH_SUFFIXES "include")
-+  find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
- else()
-  find_library(
-    BROTLI_COMMON_LIBRARY
-    NAMES brotlicommon
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATH_SUFFIXES "lib64" "lib" "bin")
-  find_library(
-    BROTLI_ENC_LIBRARY
-    NAMES brotlienc
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATH_SUFFIXES "lib64" "lib" "bin")
-  find_library(
-    BROTLI_DEC_LIBRARY
-    NAMES brotlidec
-          ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-          ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-    PATH_SUFFIXES "lib64" "lib" "bin")
-   find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
- endif()
- 
-+find_library(BROTLI_COMMON_LIBRARY NAMES brotlicommon brotlicommon-static libbrotlicommon libbrotlicommon-static)
-+find_library(BROTLI_ENC_LIBRARY NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static)
-+find_library(BROTLI_DEC_LIBRARY NAMES brotlidec libbrotlidec libbrotlidec-static brotlidec brotlidec-static)
-+
- find_package_handle_standard_args(Brotli
-                                   REQUIRED_VARS
-                                   BROTLI_COMMON_LIBRARY
+-    if(MSVC)
+    if(MSVC AND 0)
+       set(LIB_NAME_STATIC ${LIB_NAME}_static)
+     else()
+       set(LIB_NAME_STATIC ${LIB_NAME})
 diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
-index 3606f5c..1d18b7c 100644
+index 8410916..a196b25 100644
 --- a/cpp/cmake_modules/FindLz4.cmake
 +++ b/cpp/cmake_modules/FindLz4.cmake
-@@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
+@@ -19,14 +19,16 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
   set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
 endif()
 
@ -126,42 +27,36 @@ index 3606f5c..1d18b7c 100644
 -set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
 +set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
 
- pkg_check_modules(LZ4_PC liblz4)
- if(LZ4_PC_FOUND)
-   set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
+ if(LZ4_ROOT)
+   find_library(
+     LZ4_LIB
+-    NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+    NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+           "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+     PATHS ${LZ4_ROOT}
+     PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+@@ -43,14 +45,14 @@ else()
+     set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
 
-   list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
-  find_library(LZ4_LIB lz4
-+  find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}
-                PATHS ${LZ4_PC_LIBRARY_DIRS}
-                NO_DEFAULT_PATH
-                PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
- elseif(LZ4_ROOT)
-   find_library(
-     LZ4_LIB
-    NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-          "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
-+    NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-+          "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
-     PATHS ${LZ4_ROOT} "${LZ4_ROOT}/Library"
-     PATH_SUFFIXES "lib64" "lib" "bin"
-     NO_DEFAULT_PATH)
-@@ -48,8 +50,8 @@ elseif(LZ4_ROOT)
- else()
-   find_library(
-     LZ4_LIB
-    NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-          "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
-+    NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-+          "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
-     PATH_SUFFIXES "lib64" "lib" "bin")
-   find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include")
- endif()
+     list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
+-    find_library(LZ4_LIB lz4
+    find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+                  PATHS ${LZ4_PC_LIBRARY_DIRS}
+                  NO_DEFAULT_PATH
+                  PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+   else()
+     find_library(
+       LZ4_LIB
+-      NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+      NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+             "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+       PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+     find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
 diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake
-index a4decf7..78ec7c8 100644
+index 87cc24e..4de0760 100644
 --- a/cpp/cmake_modules/FindThrift.cmake
 +++ b/cpp/cmake_modules/FindThrift.cmake
-@@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
+@@ -54,6 +54,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
   set(THRIFT_MSVC_STATIC_LIB_SUFFIX md)
 endif()
 
@ -169,33 +64,33 @@ index a4decf7..78ec7c8 100644
 +  set(THRIFT_LIB_NAME_DEBUG_SUFFIX d)
 +endif()
 +
- pkg_check_modules(THRIFT_PC thrift)
+ if(Thrift_ROOT)
+   find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+                PATHS ${Thrift_ROOT}
+@@ -71,15 +75,13 @@ else()
 
- # THRIFT-4760: The pkgconfig files are currently only installed when using autotools.
-@@ -74,15 +78,13 @@ if(THRIFT_PC_FOUND)
+     list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}")
 
-   list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}")
- 
-  find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
-               PATHS ${THRIFT_PC_LIBRARY_DIRS}
-               NO_DEFAULT_PATH)
-+  find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
-+               PATHS ${THRIFT_PC_LIBRARY_DIRS})
-   find_program(THRIFT_COMPILER thrift
-                HINTS ${THRIFT_PC_PREFIX}
-               NO_DEFAULT_PATH
-                PATH_SUFFIXES "bin")
- else()
-  find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
-+  find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
-                HINTS ${Thrift_ROOT}
-                PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
-   find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
+-    find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+-                 PATHS ${THRIFT_PC_LIBRARY_DIRS}
+-                 NO_DEFAULT_PATH)
+    find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
+                 PATHS ${THRIFT_PC_LIBRARY_DIRS})
+     find_program(THRIFT_COMPILER thrift
+                  HINTS ${THRIFT_PC_PREFIX}
+-                 NO_DEFAULT_PATH
+                  PATH_SUFFIXES "bin")
+   else()
+-    find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+    find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
+                  PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
+     find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include")
+     find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin")
 diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
-index 17b58a3..fa2ab05 100644
+index 8e47086..d7ce559 100644
 --- a/cpp/cmake_modules/FindZSTD.cmake
 +++ b/cpp/cmake_modules/FindZSTD.cmake
-@@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
+@@ -19,14 +19,18 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
   set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
 endif()
 
@ -207,91 +102,29 @@ index 17b58a3..fa2ab05 100644
 +set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
 set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
 
- pkg_check_modules(ZSTD_PC libzstd)
-@@ -27,18 +31,15 @@ if(ZSTD_PC_FOUND)
-   set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
- 
-   list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
-  find_library(ZSTD_LIB zstd
-+  find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
-                PATHS ${ZSTD_PC_LIBRARY_DIRS}
-                NO_DEFAULT_PATH
-                PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
- elseif(ZSTD_ROOT)
+ # First, find via if specified ZTD_ROOT
+ if(ZSTD_ROOT)
   message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
   find_library(ZSTD_LIB
 -               NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
-               PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
-               PATH_SUFFIXES "lib64" "lib" "bin"
-               NO_DEFAULT_PATH)
 +               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-   find_path(ZSTD_INCLUDE_DIR
-             NAMES zstd.h
-             PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
-@@ -46,9 +47,8 @@ elseif(ZSTD_ROOT)
-             PATH_SUFFIXES "include")
- else()
-   find_library(ZSTD_LIB
-               NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
-               PATH_SUFFIXES "lib64" "lib" "bin")
-+               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-   find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
- endif()
+                      "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                PATHS ${ZSTD_ROOT}
+                PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+@@ -44,14 +48,14 @@ else()
+     set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
 
-diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake
-index a9b8684..fdb815a 100644
--- a/cpp/cmake_modules/FindgflagsAlt.cmake
-+++ b/cpp/cmake_modules/FindgflagsAlt.cmake
-@@ -15,18 +15,13 @@
- # specific language governing permissions and limitations
- # under the License.
- 
-if(gflags_ROOT)
-  find_library(gflags_LIB NAMES gflags PATHS ${gflags_ROOT} NO_DEFAULT_PATH)
-  find_path(GFLAGS_INCLUDE_DIR
-            NAMES gflags/gflags.h
-            PATHS ${gflags_ROOT}
-            NO_DEFAULT_PATH
-            PATH_SUFFIXES "include")
-else()
-  find_library(gflags_LIB NAMES gflags)
-  find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
-+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-+  set(GFLAGS_LIB_NAME_DEBUG_SUFFIX _debug)
- endif()
- 
-+find_library(gflags_LIB NAMES gflags${GFLAGS_LIB_NAME_DEBUG_SUFFIX} gflags_static${GFLAGS_LIB_NAME_DEBUG_SUFFIX})
-+find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
-+
- find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR)
- 
- if(gflagsAlt_FOUND)
-diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-index bdb122b..58c123e 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-@@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS)
-   elseif(gflags_SOURCE STREQUAL "SYSTEM")
-     # gflagsConfig.cmake is not installed on Ubuntu/Debian
-     # TODO: Make a bug report upstream
-    find_package(gflags)
-    if(NOT gflags_FOUND)
-      find_package(gflagsAlt REQUIRED)
-    endif()
-+    find_package(gflagsAlt REQUIRED)
-   endif()
-   # TODO: Don't use global includes but rather target_include_directories
-   include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
-@@ -1558,7 +1555,7 @@ if(ARROW_WITH_FLATBUFFERS)
-   elseif(Flatbuffers_SOURCE STREQUAL "BUNDLED")
-     build_flatbuffers()
-   elseif(Flatbuffers_SOURCE STREQUAL "SYSTEM")
-    find_package(Flatbuffers QUIET)
-+    #find_package(Flatbuffers QUIET) - disabled because on vcpkg this looks in the wrong place for the fb compiler and causes an error
-     if(NOT Flatbuffers_FOUND)
-       find_package(FlatbuffersAlt REQUIRED)
-     endif()
+     list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
+-    find_library(ZSTD_LIB zstd
+    find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
+                  PATHS ${ZSTD_PC_LIBRARY_DIRS}
+                  NO_DEFAULT_PATH
+                  PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+     # Third, check all other CMake paths
+   else()
+     find_library(ZSTD_LIB
+-                 NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+                 NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+                        "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                  PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+     find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
--- a/ports/arrow/findzstd.patch
+++ b/ports/arrow/findzstd.patch
@ -1,79 +0,0 @@
-diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
-index 21b4981ec..818e4b5e1 100644
--- a/cpp/cmake_modules/FindZSTD.cmake	
-+++ b/cpp/cmake_modules/FindZSTD.cmake
-@@ -19,44 +19,60 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
-   set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
- endif()
- 
-if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-  set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
-endif()
-
-+set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
-set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}")
- set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
- 
-+set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}"
-+                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd")
-+set(ZSTD_LIB_NAMES_DEBUG)
-+foreach(_zstd_name ${ZSTD_LIB_NAMES_RELEASE})
-+    list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${ZSTD_LIB_NAME_DEBUG_SUFFIX})
-+    if(DEFINED CMAKE_DEBUG_POSTFIX)
-+        list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${CMAKE_DEBUG_POSTFIX})
-+    endif()
-+endforeach()
-+
- pkg_check_modules(ZSTD_PC libzstd)
- if(ZSTD_PC_FOUND)
-   set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
- 
-   list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
-  find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
-+  find_library(ZSTD_LIBRARY_RELEASE ${ZSTD_LIB_NAMES_RELEASE}
-                PATHS ${ZSTD_PC_LIBRARY_DIRS}
-                NO_DEFAULT_PATH
-                PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
-+  find_library(ZSTD_LIBRARY_DEBUG ${ZSTD_LIB_NAMES_DEBUG}
-+               PATHS ${ZSTD_PC_LIBRARY_DIRS}
-+               NO_DEFAULT_PATH
-+               PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
-+
- elseif(ZSTD_ROOT)
-   message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
-  find_library(ZSTD_LIB
-               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+  find_library(ZSTD_LIBRARY_RELEASE
-+               NAMES ${ZSTD_LIB_NAMES_RELEASE})
-+  find_library(ZSTD_LIBRARY_DEBUG
-+               NAMES ${ZSTD_LIB_NAMES_DEBUG})
-   find_path(ZSTD_INCLUDE_DIR
-             NAMES zstd.h
-             PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
-             NO_DEFAULT_PATH
-             PATH_SUFFIXES "include")
- else()
-  find_library(ZSTD_LIB
-               NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-                     "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+  find_library(ZSTD_LIBRARY_RELEASE
-+               NAMES ${ZSTD_LIB_NAMES_RELEASE})
-+  find_library(ZSTD_LIBRARY_DEBUG
-+               NAMES ${ZSTD_LIB_NAMES_DEBUG})
-   find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
- endif()
-
-+select_library_configurations(ZSTD)
-+set(ZSTD_LIB ${ZSTD_LIBRARY})
- find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIB ZSTD_INCLUDE_DIR)
- 
- if(ZSTD_FOUND)
-   add_library(ZSTD::zstd UNKNOWN IMPORTED)
-   set_target_properties(ZSTD::zstd
-                        PROPERTIES IMPORTED_LOCATION "${ZSTD_LIB}"
-+                        PROPERTIES IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}"
-+                                   IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}"
-                                    INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIR}")
- endif()
--- a/ports/arrow/msvc-libname.patch
+++ b/ports/arrow/msvc-libname.patch
@ -1,13 +0,0 @@
-diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
-index 0f014ba..fd2e7b3 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
-+++ b/cpp/cmake_modules/BuildUtils.cmake
-@@ -289,7 +289,7 @@ function(ADD_ARROW_LIB LIB_NAME)
-       target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
-     endif()
- 
-    if(MSVC)
-+    if(MSVC AND 0)
-       set(LIB_NAME_STATIC ${LIB_NAME}_static)
-     else()
-       set(LIB_NAME_STATIC ${LIB_NAME})
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@ -7,13 +7,11 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO apache/arrow
-    REF apache-arrow-0.13.0
-    SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d
+    REF apache-arrow-0.14.1
+    SHA512 f5493a62becaaee9d26e05f33509f51c98e96a5efd5d5bbdffdf70456c254b62075f1c9bc63d1119289a22d00359dfe9862078a284f8e063ecf13bd338a50728
    HEAD_REF master
    PATCHES
        all.patch
-        msvc-libname.patch
-        findzstd.patch
 )

 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
--- a/ports/aws-lambda-cpp/CONTROL
+++ b/ports/aws-lambda-cpp/CONTROL
@ -1,4 +1,4 @@
 Source: aws-lambda-cpp
-Version: 0.1.0-1
+Version: 0.1.0-2
 Build-Depends: curl
 Description: C++ Runtime for AWS Lambda.
--- a/ports/aws-lambda-cpp/portfile.cmake
+++ b/ports/aws-lambda-cpp/portfile.cmake
@ -1,8 +1,9 @@
 include(vcpkg_common_functions)

-if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
-endif()
+vcpkg_fail_port_install(MESSAGE "aws-lambda-cpp currently only supports Linux and Mac platforms" ON_TARGET "Windows")
+#if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+#    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
+#endif()

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 6.1.0
+Version: 6.1.0-2
 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
 Description: Microsoft Azure Storage Client SDK for C++
  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@ -13,10 +13,12 @@ vcpkg_from_github(
    PATCHES
        # on osx use the uuid.h that is part of the osx sdk
        builtin-uuid-osx.patch
+        remove-gcov-dependency.patch
 )

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage
+    PREFER_NINJA
    OPTIONS
        -DCMAKE_FIND_FRAMEWORK=LAST
        -DBUILD_TESTS=OFF
--- a/ports/azure-storage-cpp/remove-gcov-dependency.patch
+++ b/ports/azure-storage-cpp/remove-gcov-dependency.patch
@ -0,0 +1,14 @@
+diff --git a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
+index 6443f8e..db20749 100644
+--- a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
+++ b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
+@@ -63,9 +63,6 @@ if(UNIX OR WIN32)
+     )
+ endif()
+ 
+-if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+-endif()
+ if (APPLE)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
+ else()
--- a/ports/basisu/CONTROL
+++ b/ports/basisu/CONTROL
@ -0,0 +1,5 @@
+Source: basisu
+Version: 0.0.1-1
+Homepage: https://github.com/BinomialLLC/basis_universal
+Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. 
+Build-Depends: lodepng
--- a/ports/basisu/portfile.cmake
+++ b/ports/basisu/portfile.cmake
@ -0,0 +1,42 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jherico/basis_universal
+    REF 11aa181a4bbf051475a01a1e73e39bf388819215
+    SHA512 62d7de6c6ca5e6235c8a377767389a7d5393e05bb5d0c024ce756e77d235132efa48280c9d529b6a91eddf0c906c3c84b6b78fdf339b1a47039b28d04161d2fe
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+
+#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/basisu)
+if (WIN32)
+    set(TOOL_NAME basisu_tool.exe)
+else()
+    set(TOOL_NAME basisu_tool)
+endif()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/basisu)
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/basisu/LICENSE ${CURRENT_PACKAGES_DIR}/share/basisu/copyright)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu)
+
+# Remove unnecessary files
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+vcpkg_copy_pdbs()
--- a/ports/bento4/CONTROL
+++ b/ports/bento4/CONTROL
@ -0,0 +1,5 @@
+Source: bento4
+Version: 1.5.1-628
+Homepage: https://github.com/axiomatic-systems/Bento4
+Description: Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.
+
--- a/ports/bento4/LICENSE
+++ b/ports/bento4/LICENSE
@ -0,0 +1,6 @@
+Bento4 is developed by Axiomatic Systems LLC in San Francisco, California.
+
+This software is available under two different licenses
+For applications that are entirely distributable under the terms of the GPL(https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html), the Bento4 GPL license applies.
+For applications that cannot be entirely distributable under the terms of the GPL (either the application, or code modules linked with the application are not compatible with the terms of the GPL licence), a non-GPL commercial license is available from Axiomatic Systems LLC.
+Contact Gilles Boccon-Gibod (licensing@axiosys.com or bok@bok.net) for more information.
--- a/ports/bento4/fix-install-and-c4996-error.patch
+++ b/ports/bento4/fix-install-and-c4996-error.patch
@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f08b2f..fccf2a8 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -35,6 +35,8 @@ endif()
+ 
+ add_library(ap4 STATIC ${AP4_SOURCES})
+ 
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
+ # Includes
+ include_directories(
+   ${SOURCE_CORE}
+@@ -43,6 +45,14 @@ include_directories(
+   ${SOURCE_METADATA}
+ )
+ 
+# AP4 includes
+file(GLOB AP4_INCLUDES
+  ${SOURCE_CODECS}/*.h
+  ${SOURCE_CORE}/*.h
+  ${SOURCE_CRYPTO}/*.h
+  ${SOURCE_METADATA}/*.h
+)
+
+ # Apps
+ file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*)
+ foreach(app ${BENTO4_APPS})
+@@ -50,3 +60,13 @@ foreach(app ${BENTO4_APPS})
+   add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp)
+   target_link_libraries(${binary_name} ap4)
+ endforeach()
+
+# Install targets
+install(TARGETS ap4
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+# Install headers
+install(FILES ${AP4_INCLUDES} DESTINATION include)
+\ No newline at end of file
--- a/ports/bento4/portfile.cmake
+++ b/ports/bento4/portfile.cmake
@ -0,0 +1,25 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO axiomatic-systems/Bento4
+    REF v1.5.1-628
+    SHA512 2bf44f55307178cc9128e323904acbfaa2f88e06beff26cf27fc0a7707875942de89778a0ee1a8315ef2c3b19754edad77d32fdb74f3d651f03c2623e7a9122d 
+    HEAD_REF master 
+    PATCHES fix-install-and-c4996-error.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/blend2d/CONTROL
+++ b/ports/blend2d/CONTROL
@ -1,10 +1,10 @@
 Source: blend2d
-Version: beta_2019-04-30
+Version: beta_2019-07-16
 Description: Beta 2D Vector Graphics Powered by a JIT Compiler
 Default-Features: jit, logging

 Feature: jit
-Description: asmjit is used to jit compile pipelines
+Description: Default feature. Enables jit pipeline compilation. Not supported for ARM and UWP.

 Feature: logging
-Description: enables logging
+Description: Default feature. Enables logging.
--- a/ports/blend2d/portfile.cmake
+++ b/ports/blend2d/portfile.cmake
@ -3,12 +3,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO blend2d/blend2d
-  REF 69141350b5a654f328c8529ae301aa1e6bad5342
-  SHA512 d9bdd234f443c0ef8793dba1a76cc567bab3f9cf32d835d9e285f7ad946a56e0bc03eab30f61bbce51318e18a74ecfcfc965ac94e1ff6cef21e9b3ccc6a42120
+  REF 934d07161971aeef5c4ac3b15e69ff57929445ac
+  SHA512 71b17611c20a8a7d27a37b0984918ce4ed608d8d2d053d116cd4c0ca9b7fcad742f39ef9939d9addf600113c2ad399d1dc4ee72b5f036ccda58b7d4237316928
  HEAD_REF master
 )

-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC)

 if(NOT ("jit" IN_LIST FEATURES))
  set(BLEND2D_BUILD_NO_JIT TRUE)
@ -17,14 +17,13 @@ if(NOT ("logging" IN_LIST FEATURES))
  set(BLEND2D_BUILD_NO_LOGGING TRUE)
 endif()

-
 if(NOT BLEND2D_BUILD_NO_JIT)
  vcpkg_from_github(
    OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
    REPO asmjit/asmjit
-    REF f4e685cef003c40ad0d348d0c9eb2a1fe63d8521
-    SHA512 77981fc32e746fc88f5707b4a8e8557283261b2657248f0d4900f47bd500de4efe47619a53f32413ea3c6f116e084cac6fdb48b6b92d75e824585d94c785d2b1
-    HEAD_REF next-wip
+    REF 5d40561d14f93dc45613bfa03155d1dfb4f5825a
+    SHA512 88f16fc1ff8e9eb1b8d7441d7bd2e08d238a2104f3de94aaa16972faac704bf526996fa1556a3831701fb370f051df6839b4058690cf2f49ea5aeb1224c84fe0
+    HEAD_REF master
  )

  file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/asmjit)
@ -38,7 +37,7 @@ vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
    OPTIONS
-        -DBLEND2D_BUILD_STATIC=${BLEND2D_BUILD_STATIC}
+        -DBLEND2D_STATIC=${BLEND2D_STATIC}
        -DBLEND2D_BUILD_NO_JIT=${BLEND2D_BUILD_NO_JIT}
        -DBLEND2D_BUILD_NO_LOGGING=${BLEND2D_BUILD_NO_LOGGING}
 )
@ -50,11 +49,16 @@ vcpkg_copy_pdbs()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)


-if(BLEND2D_BUILD_STATIC)
+if(BLEND2D_STATIC)
  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()



 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/blend2d RENAME copyright)
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+if(BLEND2D_STATIC)
+  # Install usage
+  configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+endif()
--- a/ports/blend2d/usage
+++ b/ports/blend2d/usage
@ -0,0 +1 @@
+Define BL_STATIC before any @PORT@ includes.
--- a/ports/blosc/0001-find-deps.patch
+++ b/ports/blosc/0001-find-deps.patch
@ -0,0 +1,107 @@
+diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
+index 1d1bebe..3a7a51c 100644
+--- a/blosc/CMakeLists.txt
+++ b/blosc/CMakeLists.txt
+@@ -109,7 +109,7 @@ endif(NOT DEACTIVATE_ZLIB)
+ 
+ if (NOT DEACTIVATE_ZSTD)
+     if (ZSTD_FOUND)
+-        set(LIBS ${LIBS} ${ZSTD_LIBRARY})
+        set(LIBS ${LIBS} ${ZSTD_LIBRARIES})
+     else (ZSTD_FOUND)
+       file(GLOB ZSTD_FILES
+         ${ZSTD_LOCAL_DIR}/common/*.c
+diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake
+index e581a80..8ce17c5 100644
+--- a/cmake/FindLZ4.cmake
+++ b/cmake/FindLZ4.cmake
+@@ -1,10 +1,13 @@
+-find_path(LZ4_INCLUDE_DIR lz4.h)
+find_path(LZ4_INCLUDE_DIRS NAMES lz4.h)
+ 
+-find_library(LZ4_LIBRARY NAMES lz4)
+find_library(LZ4_LIBRARY_DEBUG NAMES lz4d)
+find_library(LZ4_LIBRARY_RELEASE NAMES lz4)
+ 
+-if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
+-    set(LZ4_FOUND TRUE)
+-    message(STATUS "Found LZ4 library: ${LZ4_LIBRARY}")
+-else ()
+-    message(STATUS "No LZ4 library found.  Using internal sources.")
+-endif ()
+include(SelectLibraryConfigurations)
+select_library_configurations(LZ4)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    LZ4
+    REQUIRED_VARS LZ4_LIBRARIES LZ4_INCLUDE_DIRS
+)
+diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake
+index 688d4d5..c8b9a05 100644
+--- a/cmake/FindSnappy.cmake
+++ b/cmake/FindSnappy.cmake
+@@ -1,10 +1,13 @@
+-find_path(SNAPPY_INCLUDE_DIR snappy-c.h)
+find_path(SNAPPY_INCLUDE_DIR snappy.h)
+ 
+-find_library(SNAPPY_LIBRARY NAMES snappy)
+find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd)
+find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy)
+ 
+-if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
+-    set(SNAPPY_FOUND TRUE)
+-    message(STATUS "Found SNAPPY library: ${SNAPPY_LIBRARY}")
+-else ()
+-    message(STATUS "No snappy found.  Using internal sources.")
+-endif ()
+include(SelectLibraryConfigurations)
+select_library_configurations(SNAPPY)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    SNAPPY DEFAULT_MSG
+    SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR
+)
+diff --git a/cmake/FindZstd.cmake b/cmake/FindZstd.cmake
+index 7db4bb9..ba20ba6 100644
+--- a/cmake/FindZstd.cmake
+++ b/cmake/FindZstd.cmake
+@@ -1,10 +1,30 @@
+include(FindPackageHandleStandardArgs)
+
+ find_path(ZSTD_INCLUDE_DIR zstd.h)
+ 
+-find_library(ZSTD_LIBRARY NAMES zstd)
+get_filename_component(_prefix_path ${ZSTD_INCLUDE_DIR} PATH)
+
+find_library(
+    ZSTD_LIBRARY_DEBUG
+    NAMES zstdd
+    PATHS ${_prefix_path}/debug/lib
+    NO_DEFAULT_PATH
+)
+
+find_library(
+    ZSTD_LIBRARY_RELEASE
+    NAMES zstd
+    PATHS ${_prefix_path}/lib
+    NO_DEFAULT_PATH
+)
+
+unset(_prefix_path)
+
+include(SelectLibraryConfigurations)
+select_library_configurations(ZSTD)
+ 
+-if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
+-    set(ZSTD_FOUND TRUE)
+-    message(STATUS "Found Zstd library: ${ZSTD_LIBRARY}")
+-else ()
+-    message(STATUS "No Zstd library found.  Using internal sources.")
+-endif ()
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    ZSTD
+    REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIR
+)
--- a/ports/blosc/CONTROL
+++ b/ports/blosc/CONTROL
@ -1,5 +1,5 @@
 Source: blosc
-Version: 1.16.3-1
+Version: 1.17.0-1
 Build-Depends: lz4, snappy, zlib, zstd
 Homepage: https://github.com/Blosc/c-blosc
 Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`
--- a/ports/blosc/FindBlosc.cmake
+++ b/ports/blosc/FindBlosc.cmake
@ -0,0 +1,33 @@
+include(FindPackageHandleStandardArgs)
+
+find_path(
+  BLOSC_INCLUDE_DIRS
+  blosc.h
+)
+
+get_filename_component(_prefix_path ${BLOSC_INCLUDE_DIRS} PATH)
+
+find_library(
+    BLOSC_LIBRARY_DEBUG
+    NAMES blosc
+    PATHS ${_prefix_path}/debug/lib
+    NO_DEFAULT_PATH
+)
+
+find_library(
+    SNAPPY_LIBRARY_RELEASE
+    NAMES blosc
+    PATHS ${_prefix_path}/lib
+    NO_DEFAULT_PATH
+)
+
+unset(_prefix_path)
+
+include(SelectLibraryConfigurations)
+select_library_configurations(blosc)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    blosc
+    REQUIRED_VARS BLOSC_LIBRARIES BLOSC_INCLUDE_DIRS
+)
--- a/ports/blosc/portfile.cmake
+++ b/ports/blosc/portfile.cmake
@ -3,9 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Blosc/c-blosc
-    REF v1.16.3
-    SHA512 2ff67a6e955a641c3a2330140e5887d0ce3fdcbf6b205507798a4e848a35ba2e22bf8fd91133291bc73c4e48fb01c02139e47ab8e4774d0e2288872e625c9ffd
+    REF v1.17.0
+    SHA512 7fe517e9d050a36839ddf963e718881533cc10a7c8963222b3167fd48ec84455614206c1cc2c248f52042a019262fa0419c4c1a828eb1ae64294c55bbaf56f6e
    HEAD_REF master
+    PATCHES
+      0001-find-deps.patch
 )

 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
@ -20,6 +22,7 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs)

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS -DPREFER_EXTERNAL_LZ4=ON
            -DPREFER_EXTERNAL_SNAPPY=ON
            -DPREFER_EXTERNAL_ZLIB=ON
@ -50,3 +53,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSES/BLOSC.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/blosc RENAME copyright)

+file(COPY
+    "${CMAKE_CURRENT_LIST_DIR}/FindBlosc.cmake"
+  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@ -1,6 +1,6 @@
-Source: bond
-Maintainer: bond@microsoft.com
-Version: 8.1.0-2
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
-Homepage: https://github.com/Microsoft/bond
-Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
+Source: bond
+Maintainer: bond@microsoft.com
+Version: 8.1.0-2
+Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
+Homepage: https://github.com/Microsoft/bond
+Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
--- a/ports/boolinq/CONTROL
+++ b/ports/boolinq/CONTROL
@ -0,0 +1,4 @@
+Source: boolinq
+Version: 2019-07-22
+Description: Super tiny C++11 single-file header-only LINQ library
+Homepage: https://github.com/k06a/boolinq
--- a/ports/boolinq/portfile.cmake
+++ b/ports/boolinq/portfile.cmake
@ -0,0 +1,16 @@
+# Single-file header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO k06a/boolinq
+    REF 1d09dc8b3df79801062e5c0e758572552fa4ce98
+    SHA512 0714a97d09bb8299d39062803a8cd5de28834c372f7826afc36e17ea6aa90d2ec368d5bbb907914ad1ca5a65be41a5caeaa1583f66358577d7ea88d3c0906238
+    HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/include/boolinq/boolinq.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/boolinq)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-asio
-Version: 1.70.0-1
+Version: 1.70.0-2
 Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
 Homepage: https://github.com/boostorg/asio
 Description: Boost asio module
--- a/ports/boost-asio/portfile.cmake
+++ b/ports/boost-asio/portfile.cmake
@ -8,6 +8,7 @@ vcpkg_from_github(
    REF boost-1.70.0
    SHA512 394c7e557d97bbb8b98453846a098c8ab7f4eb92d752bd4089d2020e0d5060cff1e53f5e50b2f8910e64b66c934b2bde4a7137bd1a6050e8b1279c2e4576b2e5
    HEAD_REF master
+    PATCHES windows_alloca_header.patch
 )

 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
--- a/ports/boost-asio/windows_alloca_header.patch
+++ b/ports/boost-asio/windows_alloca_header.patch
@ -0,0 +1,15 @@
+diff --git a/include/boost/asio/detail/impl/socket_ops.ipp b/include/boost/asio/detail/impl/socket_ops.ipp
+index 7d7c31f..d2cd468 100644
+--- a/include/boost/asio/detail/impl/socket_ops.ipp
+++ b/include/boost/asio/detail/impl/socket_ops.ipp
+@@ -27,6 +27,10 @@
+ #include <boost/asio/detail/socket_ops.hpp>
+ #include <boost/asio/error.hpp>
+ 
+#if defined(BOOST_ASIO_WINDOWS)
+#include <malloc.h>
+#endif
+
+ #if defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ # include <codecvt>
+ # include <locale>
--- a/ports/boost-callable-traits/CONTROL
+++ b/ports/boost-callable-traits/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-callable-traits
-Version: 1.70.0
+Version: 2.3.2
 Build-Depends: boost-vcpkg-helpers
 Homepage: https://github.com/boostorg/callable_traits
 Description: Boost callable_traits module
--- a/ports/boost-callable-traits/portfile.cmake
+++ b/ports/boost-callable-traits/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO boostorg/callable_traits
-    REF boost-1.70.0
-    SHA512 73742aa4094cef8f4b24833036f99449343dd6c572919db8fb464f76dc527d99a5a57e52bbfe6b20089041aa43ecb7a87ec528a7aea2fef5a8b15f6ced553769
+    REF 2.3.2
+    SHA512 32d69cc0bdaecfcf69f9e6079f6b80738ea95937cb2ef802d4d26771745c0d7179c9074ed6312ef1c2d45cf1711979ecf9a8407677d18e625bfb859bca1aa319
    HEAD_REF master
 )

--- a/ports/boost-mpi/CONTROL
+++ b/ports/boost-mpi/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-mpi
-Version: 1.70.0-1
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi
+Version: 1.70.0-2
+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi
 Homepage: https://github.com/boostorg/mpi
 Description: Boost mpi module
--- a/ports/boost-type-erasure/CONTROL
+++ b/ports/boost-type-erasure/CONTROL
@ -1,6 +1,6 @@
 # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
 Source: boost-type-erasure
-Version: 1.70.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread (!arm), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
+Version: 1.70.0-1
+Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
 Homepage: https://github.com/boostorg/type_erasure
 Description: Boost type_erasure module
--- a/ports/boost-vcpkg-helpers/generate-ports.ps1
+++ b/ports/boost-vcpkg-helpers/generate-ports.ps1
@ -368,7 +368,7 @@ foreach ($library in $libraries)
        }
        elseif ($library -eq "mpi")
        {
-            $deps += @("msmpi")
+            $deps += @("mpi")
        }

        Generate `
--- a/ports/brigand/CONTROL
+++ b/ports/brigand/CONTROL
@ -0,0 +1,6 @@
+Source: brigand
+Version: 1.3.0
+Homepage: https://github.com/edouarda/brigand
+Description: Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
+Build-Depends: boost
+
--- a/ports/brigand/fix-install-targets.patch
+++ b/ports/brigand/fix-install-targets.patch
@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13ea689..9d20700 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -292,3 +292,9 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/brigand
+ install(FILES ${CMAKE_BINARY_DIR}/libbrigand.pc
+     DESTINATION lib/pkgconfig
+ )
+
+install(TARGETS brigand
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
--- a/ports/brigand/portfile.cmake
+++ b/ports/brigand/portfile.cmake
@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO edouarda/brigand
+    REF 1.3.0
+    SHA512 538d288d84265cc9a4563f1e84d55a174db461ffd1e4f510bfdaef04af9fbf8e7ca79817f9118378bf7d58d578699aae3072bbffa3fd727b2d93ee783337aea6
+    HEAD_REF master
+    PATCHES fix-install-targets.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA   
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
--- a/ports/brynet/CONTROL
+++ b/ports/brynet/CONTROL
@ -1,5 +1,5 @@
 Source: brynet
-Version: 1.0.2
+Version: 1.0.3
 Homepage: https://github.com/IronsDu/brynet
 Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket.
 Build-Depends: openssl
--- a/ports/brynet/portfile.cmake
+++ b/ports/brynet/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO IronsDu/brynet
-    REF v1.0.2
-    SHA512 b07ceb858ed125959b3901415d6099939acf51a194950de8c65f063b6462a0ab424494659aedd889378bd4388cc9e71a0aedcb30108b6c2eef4d5e6ebea2cce8
+    REF v1.0.3
+    SHA512 8759b522da34be68a7ba0959ed3d85382965efe5080e4cdd403001f3911d36398b7fe9d039fd9fb485a0d557cec0fa53863a512eb88f13f3ff222b6e30642baf
    HEAD_REF master
 )

--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@ -1,4 +1,7 @@
 Source: bullet3
-Version: 2.88
+Version: 2.88-1
 Homepage: https://github.com/bulletphysics/bullet3
 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
+
+Feature: multithreading
+Description: Multithreading funcitonality for bullet3
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@ -10,8 +10,14 @@ vcpkg_from_github(
    HEAD_REF master
 )

+set(BULLET_MULTITHREADING OFF)
+if ("multithreading" IN_LIST FEATURES)
+    set(BULLET_MULTITHREADING ON)
+endif()
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
        -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
        -DBUILD_DEMOS=OFF
@ -21,6 +27,7 @@ vcpkg_configure_cmake(
        -DBUILD_EXTRAS=OFF
        -DBUILD_UNIT_TESTS=OFF
        -DINSTALL_LIBS=ON
+        -DBULLET2_MULTITHREADING=${BULLET_MULTITHREADING}
 )

 vcpkg_install_cmake()
--- a/ports/capnproto/CONTROL
+++ b/ports/capnproto/CONTROL
@ -1,5 +1,5 @@
 Source: capnproto
-Version: 0.7.0-2
+Version: 0.7.0-3
 Description: Data interchange format and capability-based RPC system
 Homepage: https://capnproto.org/
 Build-Depends: zlib
--- a/ports/capnproto/portfile.cmake
+++ b/ports/capnproto/portfile.cmake
@ -15,7 +15,10 @@ vcpkg_from_github(
 	PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-capnpc-extension-handling-on-Windows.patch"
 )

-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)

 vcpkg_install_cmake()

--- a/ports/casclib/CMakeLists.txt
+++ b/ports/casclib/CMakeLists.txt
@ -1,22 +1,13 @@
 cmake_minimum_required(VERSION 3.9)
-project(CascLib)

-set(HEADER_FILES
-    src/CascCommon.h
-    src/CascLib.h
-    src/CascLib.def
-    src/CascPort.h
-    src/common/Array.h
-    src/common/Common.h
-    src/common/Csv.h
-    src/common/FileStream.h
-    src/common/FileTree.h
-    src/common/ListFile.h
-    src/common/Map.h
-    src/jenkins/lookup.h
-)
+project(casclib)
+set(PROJECT_VERSION_MAJOR 1)
+set(PROJECT_VERSION_MINOR 50)
+
+option(INSTALL_HEADERS "Install header files" ON)

 set(SRC_FILES
+    src/CascLib.def
    src/CascCommon.cpp
    src/CascDecompress.cpp
    src/CascDecrypt.cpp
@ -57,18 +48,36 @@ set(ZLIB_FILES
    src/zlib/zutil.c
 )

+add_library(casclib ${SRC_FILES} ${ZLIB_FILES} ${MD5_FILES})
+target_include_directories(casclib 
+                           PUBLIC 
+                               $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+                               $<INSTALL_INTERFACE:include/casclib>)
 if(WIN32)
-    add_definitions(-DUNICODE -D_UNICODE)
+    target_compile_definitions(casclib PRIVATE UNICODE _UNICODE)
 endif()

-add_library(CascLib ${SRC_FILES} ${HEADER_FILES} ${TOMCRYPT_FILES} ${ZLIB_FILES} ${MD5_FILES})
+install(TARGETS casclib 
+        EXPORT casclibTargets
+        RUNTIME DESTINATION bin
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+)

-set_target_properties(CascLib PROPERTIES PUBLIC_HEADER "src/CascLib.h;src/CascPort.h")
+include(CMakePackageConfigHelpers)

-install(TARGETS CascLib
-	RUNTIME DESTINATION bin 
-	LIBRARY DESTINATION lib 
-	ARCHIVE DESTINATION lib 
-	FRAMEWORK DESTINATION /Library/Frameworks
-	PUBLIC_HEADER DESTINATION include
-	INCLUDES DESTINATION include)
+set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfigVersion.cmake")
+set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfig.cmake")
+set(INSTALL_DIR "share/casclib")
+
+write_basic_package_version_file("${VERSION_CONFIG}" VERSION 1.50 COMPATIBILITY SameMajorVersion)
+configure_package_config_file("Config.cmake.in"
+                              "${PROJECT_CONFIG}"
+                              INSTALL_DESTINATION "${INSTALL_DIR}")
+
+install(FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" DESTINATION "${INSTALL_DIR}")
+install(EXPORT casclibTargets DESTINATION "${INSTALL_DIR}")
+
+if(INSTALL_HEADERS)
+    install(FILES "src/CascLib.h" "src/CascPort.h" DESTINATION include/casclib)
+endif()
--- a/ports/casclib/CONTROL
+++ b/ports/casclib/CONTROL
@ -1,4 +1,4 @@
 Source: casclib
-Version: 1.50
+Version: 1.50-1
 Build-Depends: zlib
-Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014
+Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014
--- a/ports/casclib/Config.cmake.in
+++ b/ports/casclib/Config.cmake.in
@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+find_dependency(ZLIB REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+check_required_components("@PROJECT_NAME@")
--- a/ports/casclib/portfile.cmake
+++ b/ports/casclib/portfile.cmake
@ -10,14 +10,24 @@ vcpkg_from_github(
        ctype_for_mac.patch
 )

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY 
+        ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt 
+        ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in
+    DESTINATION 
+        ${SOURCE_PATH}
+)

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
+    OPTIONS_DEBUG 
+        -DINSTALL_HEADERS=OFF
 )

 vcpkg_install_cmake()

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE 
+     DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib 
+     RENAME copyright)
--- a/ports/catch2/CONTROL
+++ b/ports/catch2/CONTROL
@ -1,4 +1,4 @@
 Source: catch2
-Version: 2.7.2-2
+Version: 2.9.2
 Description: A modern, header-only test framework for unit testing.
 Homepage: https://github.com/catchorg/Catch2
--- a/ports/catch2/portfile.cmake
+++ b/ports/catch2/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO catchorg/Catch2
-    REF v2.7.2
-    SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae
+    REF v2.9.2
+    SHA512 06430322dbeb637902f3bdc1c4df04e2525bc3ad9aea47aaf284b311401f26f489092971a2822d5a54041ef1d01d1b1bda3eedea2ba5041ae89903d8e56db121
    HEAD_REF master
 )

--- a/ports/ccfits/CONTROL
+++ b/ports/ccfits/CONTROL
@ -1,5 +1,5 @@
 Source: ccfits
-Version: 2.5-2
+Version: 2.5-3
 Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
 Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
 Build-Depends: cfitsio
--- a/ports/ccfits/dll_exports.patch
+++ b/ports/ccfits/dll_exports.patch
@ -1,10 +1,7 @@
-Index: FITS.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITS.h	(date 1502267716000)
-+++ FITS.h	(revision )
+diff --git a/FITS.h b/FITS.h
+index e21f3db..3e97c83 100644
+--- a/FITS.h
+++ b/FITS.h
@@ -21,6 +21,8 @@
 #include "HDUCreator.h"
 // FitsError
@ -14,42 +11,33 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 namespace CCfits {
   class FITSBase;
-@@ -665,9 +667,8 @@
+@@ -665,7 +667,7 @@ do this either).
 
 
 
 -  class FITS 
-  {
-
-+  class CCFITS_EXPORT FITS
-+  {	
+  class CCFITS_EXPORT FITS 
+   {
+ 
     public:
- 
- 
-Index: HDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- HDU.h	(date 1502267716000)
-+++ HDU.h	(revision )
-@@ -568,7 +568,7 @@
+diff --git a/HDU.h b/HDU.h
+index 07f68e7..047e731 100644
+--- a/HDU.h
+++ b/HDU.h
+@@ -568,7 +568,7 @@ and return its value.
 
 
 
 -  class HDU 
-+  class CCFITS_EXPORT HDU
+  class CCFITS_EXPORT HDU 
   {
 
     public:
-Index: Table.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Table.h	(date 1502267716000)
-+++ Table.h	(revision )
-@@ -268,7 +268,7 @@
+diff --git a/Table.h b/Table.h
+index a0c1afe..9a8a5db 100644
+--- a/Table.h
+++ b/Table.h
+@@ -268,7 +268,7 @@ namespace CCfits {
 
 
 
@ -58,19 +46,16 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: Column.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Column.h	(date 1502267716000)
-+++ Column.h	(revision )
-@@ -838,14 +838,14 @@
+diff --git a/Column.h b/Column.h
+index e4496a7..b798947 100644
+--- a/Column.h
+++ b/Column.h
+@@ -838,14 +838,14 @@ namespace CCfits {
 
 
 
 -  class Column 
-+  class CCFITS_EXPORT Column
+  class CCFITS_EXPORT Column 
   {
 
     public:
@ -82,7 +67,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             RangeError (const String& msg, bool silent = true);
-@@ -857,7 +857,7 @@
+@@ -857,7 +857,7 @@ namespace CCfits {
 
 
 
@ -91,7 +76,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidDataType (const String& str = string(), bool silent = true);
-@@ -869,7 +869,7 @@
+@@ -869,7 +869,7 @@ namespace CCfits {
 
 
 
@ -100,7 +85,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidRowParameter (const String& diag, bool silent = true);
-@@ -881,7 +881,7 @@
+@@ -881,7 +881,7 @@ namespace CCfits {
 
 
 
@ -109,7 +94,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             WrongColumnType (const String& diag, bool silent = true);
-@@ -893,7 +893,7 @@
+@@ -893,7 +893,7 @@ namespace CCfits {
 
 
 
@ -118,7 +103,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             UnspecifiedLengths (const String& diag, bool silent = true);
-@@ -905,7 +905,7 @@
+@@ -905,7 +905,7 @@ namespace CCfits {
 
 
 
@ -127,7 +112,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidRowNumber (const String& diag, bool silent = true);
-@@ -917,7 +917,7 @@
+@@ -917,7 +917,7 @@ namespace CCfits {
 
 
 
@ -136,7 +121,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InsufficientElements (const String& msg, bool silent = true);
-@@ -929,7 +929,7 @@
+@@ -929,7 +929,7 @@ namespace CCfits {
 
 
 
@ -145,7 +130,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             NoNullValue (const String& diag, bool silent = true);
-@@ -941,7 +941,7 @@
+@@ -941,7 +941,7 @@ namespace CCfits {
 
 
 
@ -154,14 +139,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidNumberOfRows (int number, bool silent = true);
-Index: AsciiTable.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- AsciiTable.h	(date 1502267716000)
-+++ AsciiTable.h	(revision )
-@@ -133,7 +133,7 @@
+diff --git a/AsciiTable.h b/AsciiTable.h
+index 620cf41..d03aa44 100644
+--- a/AsciiTable.h
+++ b/AsciiTable.h
+@@ -133,7 +133,7 @@ namespace CCfits {
 
 
 
@ -170,14 +152,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: CCfits.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- CCfits.h	(date 1502267716000)
-+++ CCfits.h	(revision )
-@@ -23,7 +23,7 @@
+diff --git a/CCfits.h b/CCfits.h
+index d09438a..a62b8a6 100644
+--- a/CCfits.h
+++ b/CCfits.h
+@@ -23,7 +23,7 @@ namespace CCfits {
 #include <sys/types.h>
 #include "longnam.h"
 #include "float.h"
@ -186,7 +165,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 namespace CCfits {
   /*! \namespace CCfits
-@@ -32,8 +32,8 @@
+@@ -32,8 +32,8 @@ namespace CCfits {
   static const int BITPIX = -32;
   static const int  NAXIS =   2;
   static const int  MAXDIM = 99;
@ -197,46 +176,37 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
   extern  char BSCALE[7];
   extern  char BZERO[6];
-Index: FITSBase.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITSBase.h	(date 1502267716000)
-+++ FITSBase.h	(revision )
-@@ -30,7 +30,7 @@
+diff --git a/FITSBase.h b/FITSBase.h
+index 996fdae..0c985f9 100644
+--- a/FITSBase.h
+++ b/FITSBase.h
+@@ -30,7 +30,7 @@ namespace CCfits {
 
 
 
 -  class FITSBase 
-+  class CCFITS_EXPORT FITSBase
+  class CCFITS_EXPORT FITSBase 
   {
 
     public:
-Index: Keyword.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Keyword.h	(date 1502267716000)
-+++ Keyword.h	(revision )
-@@ -195,7 +195,7 @@
+diff --git a/Keyword.h b/Keyword.h
+index 816c119..b6df1f1 100644
+--- a/Keyword.h
+++ b/Keyword.h
+@@ -195,7 +195,7 @@ namespace CCfits {
 
 
 
 -  class Keyword 
-+  class CCFITS_EXPORT Keyword
+  class CCFITS_EXPORT Keyword 
   {
 
     public:
-Index: ExtHDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ExtHDU.h	(date 1502267716000)
-+++ ExtHDU.h	(revision )
-@@ -435,7 +435,7 @@
+diff --git a/ExtHDU.h b/ExtHDU.h
+index d075fa1..e2d7dc6 100644
+--- a/ExtHDU.h
+++ b/ExtHDU.h
+@@ -435,7 +435,7 @@ namespace CCfits {
 
 
 
@ -245,14 +215,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: PHDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- PHDU.h	(date 1502267716000)
-+++ PHDU.h	(revision )
-@@ -264,7 +264,7 @@
+diff --git a/PHDU.h b/PHDU.h
+index fe5f799..d9669b4 100644
+--- a/PHDU.h
+++ b/PHDU.h
+@@ -264,7 +264,7 @@ namespace CCfits {
 
 
 
@ -261,14 +228,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: BinTable.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- BinTable.h	(date 1502267716000)
-+++ BinTable.h	(revision )
-@@ -127,7 +127,7 @@
+diff --git a/BinTable.h b/BinTable.h
+index 68851e3..906005a 100644
+--- a/BinTable.h
+++ b/BinTable.h
+@@ -127,7 +127,7 @@ namespace CCfits {
 
 
 
@ -277,63 +241,41 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: Image.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Image.h	(date 1502267716000)
-+++ Image.h	(revision )
-@@ -32,7 +32,7 @@
- 
- 
-   template <typename T>
-  class Image 
-+  class Image
-   {
- 
-     public:
-Index: ColumnCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ColumnCreator.h	(date 1502267716000)
-+++ ColumnCreator.h	(revision )
-@@ -28,7 +28,7 @@
+diff --git a/ColumnCreator.h b/ColumnCreator.h
+index 104bd4f..15cd0ea 100644
+--- a/ColumnCreator.h
+++ b/ColumnCreator.h
+@@ -28,7 +28,7 @@ namespace CCfits {
 
 
 
 -  class ColumnCreator 
-+  class CCFITS_EXPORT ColumnCreator
+  class CCFITS_EXPORT ColumnCreator 
   {
 
     public:
-Index: FitsError.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FitsError.h	(date 1502267716000)
-+++ FitsError.h	(revision )
-@@ -14,6 +14,7 @@
+diff --git a/FitsError.h b/FitsError.h
+index 593723c..52941f6 100644
+--- a/FitsError.h
+++ b/FitsError.h
+@@ -13,6 +13,7 @@
+ //#include <exception>
 //#include <iostream>
 //#include <stl.h>
- #include <string>
 +#include "ccfits_export.h"
+ #include <string>
 using std::string;
 
- 
-@@ -90,7 +91,7 @@
+@@ -90,7 +91,7 @@ namespace CCfits {
 
 
 
 -  class FitsException 
-+  class CCFITS_EXPORT FitsException
+  class CCFITS_EXPORT FitsException 
   {
     public:
         FitsException (const string& msg, bool& silent);
-@@ -109,7 +110,7 @@
+@@ -109,7 +110,7 @@ namespace CCfits {
 
 
 
@ -342,40 +284,34 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
     public:
         FitsError (int errornum, bool silent = true);
-@@ -123,7 +124,7 @@
+@@ -123,7 +124,7 @@ namespace CCfits {
 
 
 
 -  class FitsFatal 
-+  class CCFITS_EXPORT FitsFatal
+  class CCFITS_EXPORT FitsFatal 
   {
     public:
         FitsFatal (const string& diag);
-Index: HDUCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- HDUCreator.h	(date 1502267716000)
-+++ HDUCreator.h	(revision )
-@@ -35,7 +35,7 @@
+diff --git a/HDUCreator.h b/HDUCreator.h
+index 65b82b7..2b5f717 100644
+--- a/HDUCreator.h
+++ b/HDUCreator.h
+@@ -35,7 +35,7 @@ namespace CCfits {
 
 
 
 -  class HDUCreator 
-+  class CCFITS_EXPORT HDUCreator
+  class CCFITS_EXPORT HDUCreator 
   {
 
     public:
-Index: ccfits_export.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ccfits_export.h	(revision )
-+++ ccfits_export.h	(revision )
-@@ -0,0 +1,42 @@
-+
+diff --git a/ccfits_export.h b/ccfits_export.h
+new file mode 100644
+index 0000000..a2540a6 100644
+--- /dev/null
+++ b/ccfits_export.h
+@@ -0,0 +1,41 @@
 +#ifndef CCFITS_EXPORT_H
 +#define CCFITS_EXPORT_H
 +
@ -417,13 +353,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 +#endif
 +
 +#endif
-Index: FITSUtil.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITSUtil.h	(date 1502267716000)
-+++ FITSUtil.h	(revision )
+\ No newline at end of file
+diff --git a/FITSUtil.h b/FITSUtil.h
+index 762d430..e2eee33 100644
+--- a/FITSUtil.h
+++ b/FITSUtil.h
@@ -22,6 +22,7 @@
 #include <string>
 // FitsError
@ -432,7 +366,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 #include <typeinfo>
 
 
-@@ -287,21 +288,21 @@
+@@ -287,21 +288,21 @@ object.
     template <typename T>
     void swap(std::vector<T>& left, std::vector<T>& right);
 
@ -459,7 +393,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
           bool operator()(const string& left, const string& right) const;
   };
-@@ -323,7 +324,7 @@
+@@ -323,7 +324,7 @@ object.
 
   char** CharArray(const std::vector<string>& inArray);
 
@ -468,7 +402,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 
   template <typename S, typename T> 
-@@ -633,7 +634,7 @@
+@@ -633,7 +634,7 @@ object.
 
 
 
@ -477,19 +411,78 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
     {
       public:
           UnrecognizedType (string diag, bool silent = true);
-Index: KeywordCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- KeywordCreator.h	(date 1502267716000)
-+++ KeywordCreator.h	(revision )
-@@ -24,7 +24,7 @@
+diff --git a/KeywordCreator.h b/KeywordCreator.h
+index d878a26..b2c0c70 100644
+--- a/KeywordCreator.h
+++ b/KeywordCreator.h
+@@ -24,7 +24,7 @@ namespace CCfits {
 
 
 
 -  class KeywordCreator 
-+  class CCFITS_EXPORT KeywordCreator
+  class CCFITS_EXPORT KeywordCreator 
   {
 
     public:
+diff --git a/CCfits b/CCfits
+index e9848c9..f30c9ad 100644
+--- a/CCfits
+++ b/CCfits
+@@ -2,20 +2,20 @@
+ #ifndef CCFITS
+ #define CCFITS  20031208
+ 
+-#include <CCfits/CCfits.h>
+#include <CCfits.h>
+ 
+-#include <CCfits/FITS.h>
+-#include <CCfits/BinTable.h>
+-#include <CCfits/AsciiTable.h>
+-#include <CCfits/ColumnVectorData.h>
+-#include <CCfits/ColumnData.h>
+-#include <CCfits/ColumnT.h>
+-#include <CCfits/ExtHDUT.h>
+-#include <CCfits/KeywordT.h>
+-#include <CCfits/KeyData.h>
+-#include <CCfits/FitsError.h>
+-#include <CCfits/FITSUtilT.h>
+-#include <CCfits/PHDUT.h>
+#include <FITS.h>
+#include <BinTable.h>
+#include <AsciiTable.h>
+#include <ColumnVectorData.h>
+#include <ColumnData.h>
+#include <ColumnT.h>
+#include <ExtHDUT.h>
+#include <KeywordT.h>
+#include <KeyData.h>
+#include <FitsError.h>
+#include <FITSUtilT.h>
+#include <PHDUT.h>
+ 
+ 
+ #endif
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b958fc7..0b1fb4e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -30,6 +30,11 @@ IF (BUILD_SHARED_LIBS)
+   SET (LIB_TYPE SHARED)
+ ENDIF (BUILD_SHARED_LIBS)
+ 
+
+IF (NOT BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DCCFITS_STATIC_DEFINE)
+ENDIF()
+
+ FILE(GLOB H_FILES "*.h")
+ SET(H_FILES ${H_FILES} CCfits)
+ 
+@@ -55,6 +60,7 @@ SET(SRC_FILES
+ )
+ 
+ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES})
+
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${CFITSIO_LIBRARY}
+ )
+ 
--- a/ports/ccfits/portfile.cmake
+++ b/ports/ccfits/portfile.cmake
@ -9,14 +9,11 @@ vcpkg_download_distfile(ARCHIVE
    FILENAME "CCfits-2.5.tar.gz"
    SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CCfits
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/dll_exports.patch"
-    )
-endif()
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES dll_exports.patch
+)

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
--- a/ports/cgicc/CONTROL
+++ b/ports/cgicc/CONTROL
@ -1,4 +1,4 @@
 Source: cgicc
-Version: 3.2.19-1
+Version: 3.2.19-2
 Homepage: https://www.gnu.org/software/cgicc/
 Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web
--- a/ports/cgicc/portfile.cmake
+++ b/ports/cgicc/portfile.cmake
@ -15,6 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

 vcpkg_configure_cmake(
  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
 )

--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@ -1,4 +1,4 @@
 Source: chakracore
-Version: 1.11.9
+Version: 1.11.12
 Homepage: https://github.com/Microsoft/ChakraCore
 Description: Core part of the Chakra Javascript engine
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/ChakraCore
-    REF v1.11.9
-    SHA512 4703e28f04925074bfc2057dcccee0427aacdd48f7b9f715d08a9385e4de9e804e1620cd49e8b3db7cd330d00ecd374bfaa3205dbe1f3cfce51ed0eea439a55e
+    REF v1.11.12
+    SHA512 6ff8b8fa379bd290d547ca9900c5aca47b6148f0112e58c11ab757fb2a9080119be59611fb5cb73fabae99802e8df2da35d7b8f1c351a32b452444d090d3b069
    HEAD_REF master
 )

--- a/ports/charls/CONTROL
+++ b/ports/charls/CONTROL
@ -1,4 +1,4 @@
 Source: charls
-Version: 2.0.0-1
+Version: 2.0.0-2
 Homepage: https://github.com/team-charls/charls
 Description: CharLS, a C++ JPEG-LS library implementation.
--- a/ports/charls/portfile.cmake
+++ b/ports/charls/portfile.cmake
@ -15,6 +15,7 @@ vcpkg_apply_patches(

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
        -DBUILD_TESTING=OFF
 )
--- a/ports/cjson/CONTROL
+++ b/ports/cjson/CONTROL
@ -1,5 +1,5 @@
 Source: cjson
-Version: 1.7.10-1
+Version: 1.7.12
 Description: Ultralightweight JSON parser in ANSI C

 Feature: utils
--- a/ports/cjson/portfile.cmake
+++ b/ports/cjson/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO DaveGamble/cJSON
-    REF v1.7.10
-    SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740
+    REF v1.7.12
+    SHA512 d767b7261eff3a1a50ea46cc5573f9504f5734a891ea211ad348835bfb4b80acf7f744da2d34bb1fa270cd4d44576c21bc6f52c0604b7e6ffdeb61ecb396b376
    HEAD_REF master
    PATCHES
        fix-install-path.patch
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Define BL_STATIC before any @PORT@ includes.`