Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5702

ports/anax/CONTROL

@@ -1,3 +1,3 @@
 Source: anax
-Version: 2.1.0-3
+Version: 2.1.0-4
 Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>

ports/anax/portfile.cmake

@@ -1,11 +1,3 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
@@ -14,17 +6,15 @@ vcpkg_from_github(
     REF v2.1.0
     SHA512 b573733b5f9634bf8cfc5b0715074f9a8ee29ecb48dc981d9371254a1f6ff8afbbb9ba6aa0877d53e518e5486ecc398a6d331fb9b5dbfd17d8707679216e11a3
     HEAD_REF master
-)
+    PATCHES 
-
+        Add-bin-output.patch
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/Add-bin-output.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-    -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()

ports/arrow/CONTROL

@@ -1,4 +1,4 @@
 Source: arrow
-Version: 0.11.1
+Version: 0.13.0
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog
 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.

ports/arrow/portfile.cmake

@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/arrow
-    REF apache-arrow-0.11.1
+    REF apache-arrow-0.13.0
-    SHA512 8a2de7e4b40666e4ea7818fac488549f1348e961e7cb6a4166ae4019976a574fd115dc1cabaf44bc1cbaabf15fb8e5133c8232b34fca250d8ff7c5b65c5407c8
+    SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d
     HEAD_REF master
 )
 
@@ -27,33 +27,31 @@ string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC)
 
 if (IS_STATIC)
     set(PARQUET_ARROW_LINKAGE static)
+    set(BOOST_USE_SHARED off)
+    set(USE_STATIC_CRT on)
 else()
     set(PARQUET_ARROW_LINKAGE shared)
+    set(BOOST_USE_SHARED on)
+    set(USE_STATIC_CRT off)
 endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${CPP_SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+    -DARROW_DEPENDENCY_SOURCE=SYSTEM
     -DARROW_BUILD_TESTS=off
-    -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR}
-    -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR}
-    -DARROW_ZLIB_VENDORED=ON
-    -DBROTLI_HOME=${CURRENT_INSTALLED_DIR}
-    -DLZ4_HOME=${CURRENT_INSTALLED_DIR}
-    -DZSTD_HOME=${CURRENT_INSTALLED_DIR}
-    -DSNAPPY_HOME=${CURRENT_INSTALLED_DIR}
     -DBOOST_ROOT=${CURRENT_INSTALLED_DIR}
-    -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR}
-    -DZLIB_HOME=${CURRENT_INSTALLED_DIR}
     -DARROW_PARQUET=ON
     -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
     -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
     -DBUILD_STATIC=${ARROW_BUILD_STATIC}
     -DBUILD_SHARED=${ARROW_BUILD_SHARED}
     -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE}
-    -DDOUBLE_CONVERSION_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_BOOST_USE_SHARED=${BOOST_USE_SHARED}
-    -DGLOG_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_USE_STATIC_CRT=${USE_STATIC_CRT}
+    -DARROW_GFLAGS_USE_SHARED=off
+    -DARROW_JEMALLOC=off
 )
 
 vcpkg_install_cmake()
@@ -70,6 +68,15 @@ if(WIN32)
     endif()
 endif()
 
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/arrow/cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfig.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfig.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfigVersion.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfigVersion.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets-release.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-release.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/arrow/arrowTargets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-debug.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

ports/ffmpeg/CONTROL

@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-1
+Version: 4.1-2
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
 

ports/ffmpeg/FindFFMPEG.cmake

@@ -6,6 +6,8 @@ foreach(FFMPEG_SUBLIBRARY avformat avdevice avcodec avutil swscale)
   find_library(FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY NAMES ${FFMPEG_SUBLIBRARY})
   list(APPEND FFMPEG_LIBRARIES ${FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY})
 endforeach()
-list(APPEND FFMPEG_LIBRARIES wsock32 ws2_32 Secur32)
+if(WIN32)
+  list(APPEND FFMPEG_LIBRARIES wsock32 ws2_32 Secur32)
+endif()
 
 find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)

ports/ffmpeg/build_linux.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/bash
+set -e
+export PATH=/usr/bin:$PATH
+# Export HTTP(S)_PROXY as http(s)_proxy:
+if [ "$HTTP_PROXY" ]; then
+    export http_proxy=$HTTP_PROXY
+fi
+if [ "$HTTPS_PROXY" ]; then
+    export https_proxy=$HTTPS_PROXY
+fi
+
+PATH_TO_BUILD_DIR=$1
+PATH_TO_SRC_DIR=$2
+PATH_TO_PACKAGE_DIR=$3
+# Note: $4 is extra configure options
+
+cd "$PATH_TO_BUILD_DIR"
+echo "=== CONFIGURING ==="
+"$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" $4
+echo "=== BUILDING ==="
+make -j6
+echo "=== INSTALLING ==="
+make install

ports/ffmpeg/configure_opencv.patch

@@ -1,11 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@
+@@ -6110,7 +6110,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec
  enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- enabled libopencv         && { check_header opencv2/core/core_c.h &&
+ enabled libopencv         && { check_headers opencv2/core/core_c.h &&
-                                { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
+                                { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
--                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+-                                 require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
 +                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core341 -lopencv_imgproc341; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+ enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
- enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||

ports/ffmpeg/detect-openssl.patch

@@ -12,14 +12,11 @@ diff --git a/configure b/configure
 index a1818dc..1cf2a7c 100755
 --- a/configure
 +++ b/configure
-@@ -5836,6 +5836,7 @@ enabled openssl           && { use_pkg_config openssl openssl/ssl.h OPENSSL_init
+@@ -6127,6 +6127,7 @@
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-+                               check_lib openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
                                 die "ERROR: openssl not found"; }
- enabled qtkit_indev      && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; }
+ enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
- 
+                                require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create &&
--- 
-2.10.1.windows.1
-

ports/ffmpeg/portfile.cmake

@@ -23,12 +23,22 @@ vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+if (WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make)
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-else()
+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make)
+    else()
+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make)
+    endif()
 endif()
-set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+
+if (WIN32)
+  set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+  set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
+else()
+  set(BASH bash)
+  set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/build_linux.sh)
+endif()
+
 set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
 set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
 
@@ -122,18 +132,20 @@ endif()
 
 message(STATUS "Building Options: ${OPTIONS}")
 
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+if(WIN32)
-    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd")
+    if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-    set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD")
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd")
-else()
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD")
-    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd")
+    else()
-    set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT")
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd")
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT")
+    endif()
 endif()
 
 message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
 vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+    COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" # BUILD DIR
         "${SOURCE_PATH}" # SOURCE DIR
         "${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
@@ -145,7 +157,7 @@ vcpkg_execute_required_process(
 message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+    COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" # BUILD DIR
         "${SOURCE_PATH}" # SOURCE DIR
         "${CURRENT_PACKAGES_DIR}/debug" # PACKAGE DIR

ports/fftw3/CONTROL

@@ -1,5 +1,5 @@
 Source: fftw3
-Version: 3.3.8-2
+Version: 3.3.8-3
 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
 
 Feature: openmp

ports/fftw3/fftw3_arch_fix.patch

@@ -1,8 +1,8 @@
-diff --git a/CMakeLists - Kopie.txt b/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95bd537a..245acc8f 100644
+index 95bd537a..245acc8f 100644
---- a/CMakeLists - Kopie.txt	
+--- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
++++ b/CMakeLists.txt
-@@ -131,6 +131,7 @@ endif ()
+@@ -131,6 +131,7 @@ endif ()
  
  include (CheckCCompilerFlag)
  
@@ -10,7 +10,7 @@ index 95bd537a..245acc8f 100644
  if (ENABLE_SSE)
    foreach (FLAG "-msse" "/arch:SSE")
      unset (HAVE_SSE CACHE)
-@@ -176,8 +177,9 @@ if (ENABLE_AVX2)
+@@ -176,8 +177,9 @@ if (ENABLE_AVX2)
  endif ()
  
  # AVX2 codelets require FMA support as well

ports/gdal/CONTROL

@@ -1,5 +1,5 @@
 Source: gdal
-Version: 2.4.0-1
+Version: 2.4.0-2
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
 

ports/gdal/portfile.cmake

@@ -37,14 +37,23 @@ endif()
 foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
-    vcpkg_apply_patches(
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
+      vcpkg_apply_patches(
-        PATCHES
+          SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
+          PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-static-build.patch
+          ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
-    )
+          ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-static-build.patch
+      )
+    else()
+      vcpkg_apply_patches(
+          SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
+          PATCHES
+          ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
+      )
+    endif()
 endforeach()
 
+
 find_program(NMAKE nmake REQUIRED)
 
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)

ports/giflib/portfile.cmake

@@ -22,6 +22,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG
         -DGIFLIB_SKIP_HEADERS=ON
 )

ports/glew/CONTROL

@@ -1,3 +1,3 @@
 Source: glew
-Version: 2.1.0-2
+Version: 2.1.0-3
 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.

ports/glew/portfile.cmake

@@ -13,6 +13,7 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/build/cmake
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_UTILS=OFF
     )

ports/hdf5/CONTROL

@@ -1,5 +1,5 @@
 Source: hdf5
-Version: 1.10.5-3
+Version: 1.10.5-4
 Description: HDF5 is a data model, library, and file format for storing and managing data
 Build-Depends: zlib, szip
 

ports/hdf5/portfile.cmake

@@ -3,13 +3,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 include(vcpkg_common_functions)
-#set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.5/hdf5-1.10.5)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/CMake-hdf5-1.10.5.tar.gz"
     FILENAME "CMake-hdf5-1.10.5.tar.gz"
     SHA512 a25ea28d7a511f9184d97b5b8cd4c6d52dcdcad2bffd670e24a1c9a6f98b03108014a853553fa2b00d4be7523128b5fd6a4454545e3b17ff8c66fea16a09e962
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -32,7 +30,7 @@ else()
     set(ENABLE_CPP OFF)
 endif()
 
-#Note: HDF5 Builds by default static as well as shared libraries set BUILD_SHARED_LIBS to OFF to only get static libraries
+#Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
 
 vcpkg_configure_cmake(
@@ -56,14 +54,15 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/hdf5/copyright)
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/hdf5)
 
 #Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/hdf5/copyright)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/hdf5/vcpkg-cmake-wrapper.cmake @ONLY)

ports/hdf5/vcpkg-cmake-wrapper.cmake

@@ -0,0 +1,15 @@
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
+    cmake_policy(PUSH)
+    cmake_policy(SET CMP0057 NEW)
+    if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND "HDF5" IN_LIST ARGS)
+        # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
+        if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+            set(HDF5_USE_STATIC_LIBRARIES ON)
+        else()
+            set(HDF5_USE_STATIC_LIBRARIES OFF)
+        endif()
+    endif()
+    cmake_policy(POP)
+endif()
+_find_package(${ARGS})

ports/highfive/CONTROL

@@ -1,4 +1,4 @@
 Source: highfive
-Version: 1.5-1
+Version: 2.0
 Description: HighFive is a modern C++/C++11 friendly interface for libhdf5
 Build-Depends: hdf5

ports/highfive/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BlueBrain/HighFive
-    REF v1.5
+    REF v2.0
-    SHA512 4133ec2768f54cb3e56c32f3193d6c61ea96013dc73901c39d31ecaf10b04ea2861b0f6f5c9795985050ef72a75e2d360a4b906c9cdeb8ee49309961e15d39bf
+    SHA512 d6bc38ae421adfa3cb9ee761ec92819bebe385cb100a8227bd9ff436cd7ae31725a96264a7963cfe5ce806cdd3b7978a8a630e9312c1567f6df6029062c6b8a0
     HEAD_REF master
 )
 
@@ -28,7 +28,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/HighFive)
 endif()
 

ports/libharu/CONTROL

@@ -1,4 +1,4 @@
 Source: libharu
-Version: 2017-08-15-d84867ebf9f-5
+Version: 2017-08-15-d84867ebf9f-6
 Description: libharu - free PDF library
 Build-Depends: zlib, libpng

ports/libharu/add-boolean-typedef.patch

@@ -0,0 +1,12 @@
+diff --git a/include/hpdf.h b/include/hpdf.h
+index 1cf0dd9..cce9b59 100644
+--- a/include/hpdf.h
++++ b/include/hpdf.h
+@@ -54,6 +54,7 @@
+ #include "hpdf_types.h"
+ 
+ typedef void         *HPDF_HANDLE;
++typedef HPDF_HANDLE   HPDF_Boolean;
+ typedef HPDF_HANDLE   HPDF_Doc;
+ typedef HPDF_HANDLE   HPDF_Page;
+ typedef HPDF_HANDLE   HPDF_Pages;

ports/libharu/portfile.cmake

@@ -1,11 +1,22 @@
 include(vcpkg_common_functions)
+
+vcpkg_download_distfile(SHADING_PR
+    URLS "https://github.com/libharu/libharu/pull/157.diff"
+    FILENAME "libharu-shading-pr-157.patch"
+    SHA512 f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libharu/libharu
     REF d84867ebf9f3de6afd661d2cdaff102457fbc371
     SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99
     HEAD_REF master
-    PATCHES fix-build-fail.patch
+    PATCHES
+        fix-build-fail.patch
+        add-boolean-typedef.patch
+        # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature.
+        ${SHADING_PR}
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBHPDF_STATIC)
@@ -21,7 +32,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib ${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib)
        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib)
 endif()

ports/llvm/CONTROL

@@ -1,4 +1,4 @@
 Source: llvm
-Version: 7.0.0
+Version: 7.0.0-2
 Description: The LLVM Compiler Infrastructure
 Build-Depends: atlmfc (windows)

ports/llvm/install-cmake-modules-to-share.patch

@@ -1,10 +1,26 @@
-diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+diff -urN llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt llvm-7.0.0.src/cmake/modules/CMakeLists.txt
-index ac4b0b7..13a271d 100644
+--- llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt	2018-07-27 13:57:51.000000000 +0300
---- a/cmake/modules/CMakeLists.txt
++++ llvm-7.0.0.src/cmake/modules/CMakeLists.txt	2019-03-26 14:56:34.645434190 +0200
-+++ b/cmake/modules/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
 +set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
  set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
  
  # First for users who use an installed LLVM, create the LLVMExports.cmake file.
+diff -urN llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt
+--- llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt	2018-01-24 21:26:50.000000000 +0200
++++ llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt	2019-03-26 14:57:07.173362736 +0200
+@@ -1,11 +1,11 @@
+ # Generate a list of CMake library targets so that other CMake projects can
+ # link against them. LLVM calls its version of this file LLVMExports.cmake, but
+ # the usual CMake convention seems to be ${Project}Targets.cmake.
+-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
++set(CLANG_INSTALL_PACKAGE_DIR share/clang)
+ set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
+ 
+ # Keep this in sync with llvm/cmake/CMakeLists.txt!
+-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
++set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)

ports/llvm/portfile.cmake

@@ -46,6 +46,7 @@ vcpkg_configure_cmake(
         -DLLVM_INCLUDE_TESTS=OFF
         -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF
         -DLLVM_TOOLS_INSTALL_DIR=tools/llvm
+        -DLLVM_PARALLEL_LINK_JOBS=1
 )
 
 vcpkg_install_cmake()
@@ -62,10 +63,30 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(REMOVE ${DEBUG_EXE})
 endif()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake "${RELEASE_MODULE}")
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}")
+endif()
+
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/tools

ports/msgpack/CONTROL

@@ -1,3 +1,3 @@
 Source: msgpack
-Version: 2.1.5-1
+Version: 3.1.1
 Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.

ports/msgpack/portfile.cmake

@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO msgpack/msgpack-c
-    REF cpp-2.1.5
+    REF cpp-3.1.1
-    SHA512 aab8357e494bb5aa7407b53e5e650382869ea95812a6677e085530d5f27cde6946fbfd0095b19608c75163dbb82de9ccb6a695234e7c03659fc6efc2da300e19
+    SHA512 2d1607f482160d8860b07d7597af760bfefcb3afa4e82602df43487d15950ab235e7efeabd7e08996807935de71d4dcdab424c91bff806279419db2ec9500227
     HEAD_REF master)
 
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}

ports/octomap/CONTROL

@@ -1,3 +1,3 @@
 Source: octomap
-Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-4
+Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-5
 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees

ports/octomap/portfile.cmake

@@ -14,6 +14,7 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_OCTOVIS_SUBPROJECT=OFF
         -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF

ports/qca/CONTROL

@@ -1,4 +1,4 @@
 Source: qca
-Version: 2.2.0-3
+Version: 2.2.0-4
 Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/
 Build-Depends: qt5-base

ports/qca/portfile.cmake

@@ -33,12 +33,12 @@ message(STATUS "Importing certstore")
 file(REMOVE ${SOURCE_PATH}/certs/rootcerts.pem)
 # Using file(DOWNLOAD) to use https
 file(DOWNLOAD https://raw.githubusercontent.com/mozilla/gecko-dev/master/security/nss/lib/ckfw/builtins/certdata.txt
-    ${CMAKE_CURRENT_LIST_DIR}/certdata.txt
+    ${CURRENT_BUILDTREES_DIR}/cert/certdata.txt
     TLS_VERIFY ON
 )
 vcpkg_execute_required_process(
     COMMAND ${PERL} ${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl -n ${SOURCE_PATH}/certs/rootcerts.pem
-    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/cert
     LOGNAME ca-bundle
 )
 message(STATUS "Importing certstore done")

ports/roaring/CONTROL

@@ -1,3 +1,3 @@
 Source: roaring
-Version: 2019-03-05-1
+Version: 2019-03-05-2
 Description: A better compressed bitset in C (and C++)

ports/roaring/portfile.cmake

@@ -17,6 +17,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC}
         -DENABLE_ROARING_TESTS=OFF

ports/vtk/CONTROL

@@ -1,7 +1,7 @@
 Source: vtk
 Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows)
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
 
 Feature: openvr
 Description: OpenVR functionality for VTK
@@ -18,7 +18,3 @@ Build-Depends: msmpi, hdf5[parallel]
 Feature: python
 Description: Python functionality for VTK
 Build-Depends: python3
-
-Feature: libharu
-Description: PDF libharu functionality for VTK
-Build-Depends: libharu

ports/vtk/fix-pugixml-link.patch

@@ -0,0 +1,14 @@
+diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
+index ce979ba..322e2de 100644
+--- a/IO/CityGML/CMakeLists.txt
++++ b/IO/CityGML/CMakeLists.txt
+@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
+ # pugixml does not set _INCLUDE_DIRS or _LIBRARIES
+ if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
+   find_package(pugixml REQUIRED)
+-  get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
+-  get_target_property(pugixml_LIBRARIES pugixml LOCATION)
+-  include_directories(${pugixml_INCLUDE_DIRS})
+-  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
++  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml)
+ endif()

ports/vtk/portfile.cmake

@@ -16,9 +16,9 @@ else()
 endif()
 
 if ("mpi" IN_LIST FEATURES)
-    set(VTK_WITH_MPI                     ON )
+    set(VTK_Group_MPI ON)
 else()
-    set(VTK_WITH_MPI                     OFF )
+    set(VTK_Group_MPI OFF)
 endif()
 
 if ("python" IN_LIST FEATURES)
@@ -28,15 +28,9 @@ else()
 endif()
 
 if("openvr" IN_LIST FEATURES)
-    set(VTK_WITH_OPENVR                  ON)
+    set(Module_vtkRenderingOpenVR ON)
 else()
-    set(VTK_WITH_OPENVR                  OFF)
+    set(Module_vtkRenderingOpenVR OFF)
-endif()
-
-if("libharu" IN_LIST FEATURES)
-    set(VTK_WITH_LIBHARU                  ON)
-else()
-    set(VTK_WITH_LIBHARU                  OFF)
 endif()
 
 set(VTK_WITH_ALL_MODULES                 OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`,
@@ -46,14 +40,16 @@ set(VTK_WITH_ALL_MODULES                 OFF) # IMPORTANT: if ON make sure `qt5`
 # Clone & patch
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO "Kitware/VTK"
+    REPO Kitware/VTK
     REF "v${VTK_LONG_VERSION}"
     SHA512 fd1d9c2872baa6eca7f8105b0057b56ec554e9d5eaf25985302e7fc032bdce72255d79e3f5f16ca50504151bda49cb3a148272ba32e0f410b4bdb70959b8f3f4
-    HEAD_REF "master"
+    HEAD_REF master
     PATCHES
         fix-find-lz4.patch
         fix_ogg_linkage.patch
+        fix-pugixml-link.patch
 )
+
 # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK,
 # since they do not detect the debug libraries correctly.
 # The default files distributed with CMake (>= 3.9) should be superior by all means.
@@ -73,12 +69,6 @@ if(VTK_WITH_QT)
     )
 endif()
 
-if(VTK_WITH_MPI)
-    list(APPEND ADDITIONAL_OPTIONS
-        -DVTK_Group_MPI=ON
-    )
-endif()
-
 if(VTK_WITH_PYTHON)
     list(APPEND ADDITIONAL_OPTIONS
         -DVTK_WRAP_PYTHON=ON
@@ -86,18 +76,6 @@ if(VTK_WITH_PYTHON)
     )
 endif()
 
-if(VTK_WITH_OPENVR)
-    list(APPEND ADDITIONAL_OPTIONS
-        -DModule_vtkRenderingOpenVR=ON
-    )
-endif()
-
-if(VTK_WITH_LIBHARU)
-    list(APPEND ADDITIONAL_OPTIONS
-        -DVTK_USE_SYSTEM_LIBHARU=ON
-    )
-endif()
-
 if(VTK_WITH_ALL_MODULES)
     list(APPEND ADDITIONAL_OPTIONS
         -DVTK_BUILD_ALL_MODULES=ON
@@ -123,44 +101,31 @@ endif()
 
 # =============================================================================
 # Configure & Install
-if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static")
-    set(HDF5_USE_STATIC_LIBRARIES ON)
-endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES}
-        -DHAVE_SNPRINTF=ON
-        -DVTK_Group_Imaging=ON
-        -DVTK_Group_Views=ON
         -DBUILD_TESTING=OFF
         -DBUILD_EXAMPLES=OFF
-        -DVTK_USE_SYSTEM_EXPAT=ON
-        -DVTK_USE_SYSTEM_FREETYPE=ON
-        # -DVTK_USE_SYSTEM_GL2PS=ON
-        -DVTK_USE_SYSTEM_JPEG=ON
-        -DVTK_USE_SYSTEM_GLEW=ON
-        -DVTK_USE_SYSTEM_HDF5=ON
-        -DVTK_USE_SYSTEM_JSONCPP=ON
-        -DVTK_USE_SYSTEM_LIBPROJ=ON
-        -DVTK_USE_SYSTEM_LIBXML2=ON
-        -DVTK_USE_SYSTEM_LZ4=ON
-        # -DVTK_USE_SYSTEM_NETCDF=ON
-        # -DVTK_USE_SYSTEM_NETCDFCPP=ON
-        -DVTK_USE_SYSTEM_OGG=ON
-        -DVTK_USE_SYSTEM_THEORA=ON
-        -DVTK_USE_SYSTEM_PNG=ON
-        -DVTK_USE_SYSTEM_TIFF=ON
-        -DVTK_USE_SYSTEM_ZLIB=ON
         -DVTK_INSTALL_INCLUDE_DIR=include
         -DVTK_INSTALL_DATA_DIR=share/vtk/data
         -DVTK_INSTALL_DOC_DIR=share/vtk/doc
         -DVTK_INSTALL_PACKAGE_DIR=share/vtk
         -DVTK_INSTALL_RUNTIME_DIR=bin
         -DVTK_FORBID_DOWNLOADS=ON
+
+        # We set all libraries to "system" and explicitly list the ones that should use embedded copies
+        -DVTK_USE_SYSTEM_LIBRARIES=ON
+        -DVTK_USE_SYSTEM_GL2PS=OFF
+
+        # Select modules / groups to install
+        -DVTK_Group_Imaging=ON
+        -DVTK_Group_Views=ON
         -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC}
+        -DModule_vtkRenderingOpenVR=${Module_vtkRenderingOpenVR}
+        -DVTK_Group_MPI=${VTK_Group_MPI}
+
         ${ADDITIONAL_OPTIONS}
 )
 
@@ -286,7 +251,7 @@ if(VTK_WITH_ALL_MODULES)
     file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake)
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()

scripts/buildsystems/vcpkg.cmake

@@ -192,6 +192,7 @@ macro(find_package name)
         set(Boost_USE_STATIC_LIBS OFF)
         set(Boost_USE_MULTITHREADED ON)
         unset(Boost_USE_STATIC_RUNTIME)
+        set(Boost_NO_BOOST_CMAKE ON)
         unset(Boost_USE_STATIC_RUNTIME CACHE)
         set(Boost_COMPILER "-vc140")
         _find_package(${ARGV})

scripts/cmake/vcpkg_build_cmake.cmake

@@ -162,6 +162,33 @@ function(vcpkg_build_cmake)
                             endif()
                         endwhile()
                     endif()
+                elseif(out_contents MATCHES "mt : general error c101008d: ")
+                    # Antivirus workaround - occasionally files are locked and cause mt.exe to fail
+                    set(ITERATION 0)
+                    while (ITERATION LESS 3 AND out_contents MATCHES "mt : general error c101008d: ")
+                        MATH(EXPR ITERATION "${ITERATION}+1")
+                        message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}")
+                        execute_process(
+                            COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
+                            OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log"
+                            ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log"
+                            RESULT_VARIABLE error_code
+                            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
+
+                        if(error_code)
+                            file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents)
+                            file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents)
+
+                            if(out_contents)
+                                list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log")
+                            endif()
+                            if(err_contents)
+                                list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log")
+                            endif()
+                        else()
+                            break()
+                        endif()
+                    endwhile()
                 endif()
 
                 if(error_code)
@@ -170,7 +197,7 @@ function(vcpkg_build_cmake)
                         file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG)
                         list(APPEND STRINGIFIED_LOGS "    ${NATIVE_LOG}\n")
                     endforeach()
-                    set(_eb_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG})
+                    set(_eb_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG})
                     set(_eb_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
                     message(FATAL_ERROR
                         "  Command failed: ${_eb_COMMAND}\n"