Merge branch 'master' into qualifier_change

2024-11-28 06:09:00 +08:00 · 2017-08-15 13:56:20 -07:00 · 2017-08-15 13:56:20 -07:00 · 28ae8e94d5
commit 28ae8e94d5
parent 957cb214e9 cd7f4cccff
112 changed files with 2008 additions and 683 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,237 @@
+vcpkg (0.0.83)
+--------------
+  * Add ports:
+    - fuzzylite            6.0
+    - jemalloc             4.3.1-1
+    - libkml               1.3.0
+    - pcl                  1.8.1
+    - plog                 1.1.3
+  * Update ports:
+    - catch                1.9.6 -> 1.9.7
+    - ceres                1.12.0-4 -> 1.13.0
+    - cpp-redis            3.5.2 -> 3.5.2-1
+    - gdal                 1.11.3-3 -> 1.11.3-4
+    - graphicsmagick       1.3.26 -> 1.3.26-1
+    - hypre                2.11.1 -> 2.11.2
+    - libtheora            1.1.1 -> 1.2.0alpha1-20170719~vcpkg1
+    - minizip              1.2.11 -> 1.2.11-1
+    - openblas             v0.2.19-2 -> v0.2.20
+    - openjpeg             2.1.2-2 -> 2.2.0
+    - physfs               2.0.3 -> 2.0.3-1
+    - stb                  1.0 -> 20170724-9d9f75e
+    - uwebsockets          0.14.3 -> 0.14.4
+    - vtk                  7.1.1-1 -> 8.0.0-1
+    - yaml-cpp             0.5.4 candidate -> 0.5.4-rc-1
+  * Bump required version & auto-downloaded version of `cmake` to 3.9.1 (was 3.9.0)
+  * Fixes and improvements in the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  FRI, 11 Aug 2017 12:00:00 -0800
+
+
+vcpkg (0.0.82)
+--------------
+  * Add ports:
+    - alembic              1.7.1-3
+    - allegro5             5.2.1.0
+    - angle                2017-06-14-8d471f-1
+    - apr-util             1.6.0
+    - arrow                apache-arrow-0.4.0-1
+    - aubio                0.46~alpha-2
+    - aurora               2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933
+    - benchmark            1.1.0
+    - blaze                3.1
+    - brotli               0.6.0
+    - c-ares               1.12.1-dev-40eb41f-1
+    - ceres                1.12.0-4
+    - clara                2017-07-20-9661f2b4a50895d52ebb4c59382785a2b416c310
+    - corrade              jun2017-2
+    - cpp-redis            3.5.2
+    - cppcms               1.1.0
+    - cppunit              1.13.2
+    - cpr                  1.3.0
+    - ctemplate            2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca
+    - cunit                2.1.3-1
+    - cxxopts              1.3.0
+    - dirent               2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d
+    - draco                0.10.0
+    - duktape              2.0.3-3
+    - embree               2.16.4-1
+    - evpp                 0.6.1
+    - flann                1.9.1-4
+    - folly                v2017.07.17.01
+    - g2o                  20170730_git-1
+    - geogram              1.4.9
+    - gsl-lite             0.24.0
+    - hpx                  1.0.0-4
+    - hunspell             1.6.1-1
+    - hwloc                1.11.7-1
+    - hypre                2.11.1
+    - ilmbase              2.2.0
+    - jansson              v2.10
+    - jasper               2.0.13
+    - kinectsdk1           1.8-1
+    - libconfig            1.6.0
+    - libmikmod            3.3.11.1
+    - libopusenc           0.1
+    - libssh               0.7.5
+    - libtorrent           1.1.4
+    - libusb               1.0.21-fc99620
+    - libusb-win32         1.2.6.0
+    - libzip               1.2.0-1
+    - live555              2017.06.04
+    - llvm                 4.0.0
+    - lpeg                 1.0.1-2
+    - luafilesystem        1.6.3
+    - luajit               2.0.5
+    - magnum               jun2017-5
+    - magnum-plugins       jun2017-4
+    - matio                1.5.10-1
+    - minizip              1.2.11
+    - msinttypes           2017-06-26-f9e7c5758ed9e3b9f4b2394de1881c704dd79de0
+    - nuklear              2017-06-15-5c7194c2fe2c68c1a8212712c0b4b6195382d27d
+    - ode                  0.15.1
+    - openexr              2.2.0
+    - openimageio          1.7.15
+    - openni2              2.2.0.33
+    - opusfile             0.9
+    - osg                  3.5.6
+    - paho-mqtt            Version 1.1.0 (Paho 1.2)
+    - plibsys              0.0.3
+    - podofo               0.9.5
+    - ptex                 2.1.28
+    - pystring             1.1.3
+    - python3              3.6.1
+    - qhull                2015.2
+    - qscintilla           2.10-1
+    - redshell             1.0.0
+    - rocksdb              2017-06-28-18c63af6ef2b9f014c404b88488ae52e6fead03c
+    - rtmidi               2.1.1-1
+    - rttr                 0.9.5
+    - sciter               4.0.2-1
+    - sdl2-gfx             1.0.3-1
+    - snappy               1.1.6-be6dc3d
+    - sobjectizer          5.5.19.2
+    - speex                1.2.0
+    - strtk                2017.01.02-1e2960f
+    - suitesparse          4.5.5-2
+    - sundials             2.7.0
+    - tacopie              2.4.1-1
+    - theia                0.7-d15154a
+    - thor                 v2.0
+    - thrift               20172805-72ca60debae1d9fb35d9f0085118873669006d7f
+    - uriparser            0.8.4
+    - utf8proc             2.1.0
+    - utfz                 1.2
+    - wxwidgets            3.1.0-1
+  * Update ports:
+    - apr                  1.5.2 -> 1.6.2
+    - assimp               3.3.1 -> 4.0.0
+    - beast                1.0.0-b30 -> v84-1
+    - bond                 5.3.1 -> 6.0.0
+    - boost                1.64-2 -> 1.64-5
+    - bzip2                1.0.6 -> 1.0.6-1
+    - cairo                1.15.4 -> 1.15.6
+    - catch                1.9.1 -> 1.9.6
+    - cereal               1.2.1 -> 1.2.2
+    - chakracore           1.4.0 -> 1.4.3
+    - dimcli               1.0.3 -> 2.0.0
+    - dlfcn-win32          1.1.0 -> 1.1.1
+    - dlib                 19.4-1 -> 19.4-4
+    - doctest              1.1.0 -> 1.2.0
+    - double-conversion    2.0.1 -> 3.0.0
+    - eigen3               3.3.3 -> 3.3.4
+    - expat                2.1.1 -> 2.1.1-1
+    - ffmpeg               3.2.4-2 -> 3.2.4-3
+    - fftw3                3.3.6-p11 -> 3.3.6-p12
+    - flatbuffers          1.6.0 -> 1.7.1
+    - fltk                 1.3.4-2 -> 1.3.4-4
+    - fmt                  3.0.1-4 -> 4.0.0
+    - fontconfig           2.12.1 -> 2.12.4
+    - freeglut             3.0.0 -> 3.0.0-1
+    - freeimage            3.17.0-1 -> 3.17.0-2
+    - freerdp              2.0.0-beta1+android11 -> 2.0.0-rc0~vcpkg1
+    - freetype             2.6.3-5 -> 2.8
+    - gdcm2                2.6.7 -> 2.6.8
+    - gettext              0.19 -> 0.19-1
+    - gflags               2.2.0-2 -> 2.2.0-4
+    - glew                 2.0.0-1 -> 2.0.0-2
+    - gli                  0.8.2 -> 0.8.2-1
+    - glib                 2.52.1 -> 2.52.2
+    - glm                  0.9.8.1 -> 0.9.8.4
+    - glog                 0.3.4-0472b91-1 -> 0.3.5
+    - glslang              1c573fbcfba6b3d631008b1babc838501ca925d3-1 -> 1c573fbcfba6b3d631008b1babc838501ca925d3-2
+    - graphicsmagick       1.3.25 -> 1.3.26
+    - grpc                 1.2.3 -> 1.4.1
+    - gsl                  2.3 -> 2.4-1
+    - gtk                  3.22.11 -> 3.22.15
+    - harfbuzz             1.4.6 -> 1.4.6-1
+    - lcms                 2.8 -> 2.8-1
+    - libarchive           3.3.1 -> 3.3.2
+    - libbson              1.6.2 -> 1.6.2-1
+    - libepoxy             1.4.1-7d58fd3 -> 1.4.3
+    - libevent             2.1.8-1 -> 2.1.8-2
+    - libgd                2.2.4-1 -> 2.2.4-2
+    - libjpeg-turbo        1.5.1-1 -> 1.5.2
+    - libogg               1.3.2 -> 2017-07-27-cab46b19847
+    - libpng               1.6.28-1 -> 1.6.31
+    - libraw               0.18.0-1 -> 0.18.2-2
+    - libuv                1.10.1-2 -> 1.13.1
+    - log4cplus            1.1.3-RC7 -> REL_1_2_1-RC2
+    - lzo                  2.09 -> 2.10-1
+    - msgpack              2.1.1 -> 2.1.5
+    - msmpi                8.0-1 -> 8.1
+    - nana                 1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c -> 1.5.4
+    - openal-soft          1.17.2 -> 1.18.1
+    - openblas             v0.2.19-1 -> v0.2.19-2
+    - opencv               3.2.0-1 -> 3.2.0-3
+    - openjpeg             2.1.2-1 -> 2.1.2-2
+    - openssl              1.0.2k-2 -> 1.0.2l-1
+    - openvr               1.0.5 -> 1.0.9
+    - opus                 1.1.4 -> 1.2.1
+    - pango                1.40.5-1 -> 1.40.6
+    - pcre                 8.40 -> 8.41
+    - pdcurses             3.4 -> 3.4-1
+    - portaudio            19.0.6.00 -> 19.0.6.00-1
+    - protobuf             3.2.0 -> 3.3.0-3
+    - pybind11             2.1.0 -> 2.1.0-1
+    - qt5                  5.8-1 -> 5.8-4
+    - qwt                  6.1.3-1 -> 6.1.3-2
+    - ragel                6.9 -> 6.10
+    - range-v3             20150729-vcpkg3 -> 20151130-vcpkg4
+    - rxcpp                3.0.0 -> 4.0.0-1
+    - sdl2                 2.0.5-2 -> 2.0.5-3
+    - sdl2-image           2.0.1 -> 2.0.1-1
+    - sdl2-mixer           2.0.1 -> 2.0.1-1
+    - sdl2-net             2.0.1 -> 2.0.1-1
+    - sdl2-ttf             2.0.14 -> 2.0.14-1
+    - smpeg2               2.0.0 -> 2.0.0-1
+    - spdlog               0.12.0 -> 0.13.0
+    - sqlite3              3.18.0-1 -> 3.19.1-1
+    - taglib               1.11.1-1 -> 1.11.1-3
+    - tbb                  20160916 -> 2017_U7
+    - think-cell-range     e2d3018 -> 498839d
+    - tiff                 4.0.7-1 -> 4.0.8
+    - tinyxml2             3.0.0 -> 5.0.1
+    - utfcpp               2.3.4 -> 2.3.5
+    - uwebsockets          0.14.2 -> 0.14.3
+    - vtk                  7.1.0 -> 7.1.1-1
+    - wt                   3.3.7 -> 3.3.7-1
+    - zstd                 1.1.1 -> 1.3.0
+  * `vcpkg` has exceeded 300 libraries!
+  * Add the following options to `vcpkg export` command: `--nuget-id`, `--nuget-version`
+  * Improve `vcpkg help`:
+    - Improve clarity
+    - Add `vcpkg help <topic>` option (example: `vcpkg help export`)
+    - Add `vcpkg help topics` option
+  * `vcpkg search` now also searches in the description of ports
+  * Documentation has been reworked and is now also available in ReadTheDocs: https://vcpkg.readthedocs.io/
+  * Bump required version & auto-downloaded version of `cmake` to 3.9.0 (was 3.8.0)
+  * Bump required version & auto-downloaded version of `nuget` to 4.1.0 (was 3.5.0)
+  * Huge number of fixes and improvements in the `vcpkg` tool
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 07 Aug 2017 16:00:00 -0800
+
+
 vcpkg (0.0.81)
 --------------
  * Add ports:
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ Prerequisites:
 - Windows 10, 8.1, or 7
 - Visual Studio 2017 or Visual Studio 2015 Update 3
 - Git
- *Optional: CMake 3.8.0*
+- *Optional: CMake 3.9.1*

 Clone this repository, then run
 ```
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@ -1,4 +1,4 @@
 Source: alembic
-Version: 1.7.1-2
+Version: 1.7.1-3
 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. http://alembic.io/
--- a/ports/alembic/bypass-findhdf5.patch
+++ b/ports/alembic/bypass-findhdf5.patch
@ -0,0 +1,30 @@
+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/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@ -15,12 +15,16 @@ vcpkg_from_github(

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch
+    PATCHES
+    ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch
+    ${CMAKE_CURRENT_LIST_DIR}/bypass-findhdf5.patch
 )

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

 vcpkg_install_cmake()
--- a/ports/catch/CONTROL
+++ b/ports/catch/CONTROL
@ -1,3 +1,3 @@
 Source: catch
-Version: 1.9.6
+Version: 1.9.7
 Description: C++ Automated Test Cases in Headers
--- a/ports/catch/portfile.cmake
+++ b/ports/catch/portfile.cmake
@ -1,11 +1,10 @@
 include(vcpkg_common_functions)

-set(CATCH_VERSION v1.9.6)
-
+set(CATCH_VERSION v1.9.7)
 vcpkg_download_distfile(HEADER
    URLS "https://github.com/philsquared/Catch/releases/download/${CATCH_VERSION}/catch.hpp"
    FILENAME "catch-${CATCH_VERSION}.hpp"
-    SHA512 a0e4d568a5d90e72cef6ae9e741a66909235498c2901e96623892e5b323cb3bc51d55617ee6a42b30938a0cf2564323c621bd201d94eb67ba9c4fe5de65c10ee
+    SHA512 c61fc39d9388a45d9c601c05dafeeba0e7887476b3b28e30a6ab47cb00e062be626c12d9712caa49e0cbfa3fd7517874137a24e8c293d6dd23353ea87f9fbf5c
 )

 vcpkg_download_distfile(LICENSE
--- a/ports/cereal/portfile.cmake
+++ b/ports/cereal/portfile.cmake
@ -7,7 +7,7 @@ vcpkg_from_github(
    REPO USCiLab/cereal
    REF v1.2.2
    SHA512 9567b2e19add9446b24f8afd122eea09ba6ecd1a090335cf0ab31fdc8f64c6c97daa3d9eaf0801c36a770737488e0eebf81d96d7b7a65deed30da6130f2d47eb
-    HEAD_REF master
+    HEAD_REF develop
 )

 vcpkg_configure_cmake(
--- a/ports/ceres/CONTROL
+++ b/ports/ceres/CONTROL
@ -1,4 +1,4 @@
 Source: ceres
-Version: 1.12.0-4
+Version: 1.13.0
 Build-Depends:suitesparse, eigen3, clapack, gflags, glog
 Description: non-linear optimization package
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@ -22,8 +22,8 @@ set(VCPKG_PLATFORM_TOOLSET "v140") # Force VS2015 because VS2017 compiler return
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ceres-solver/ceres-solver
-    REF 1.12.0
-    SHA512 4b4cba5627fbd80a626e8a31d9f561d6cee1c8345970304e4b5b163a9dcadc6d636257d1046ecede00781a11229ef671ee89c3e7e6baf15f49f63f36e6a2ebe1
+    REF 1.13.0
+    SHA512 b548a303d1d4eeb75545551c381624879e363a2eba13cdd998fb3bea9bd51f6b9215b579d59d6133117b70d8bf35e18b983400c3d6200403210c18fcb1886ebb
    HEAD_REF master
 )

--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@ -1,3 +1,4 @@
 Source: cpp-redis
-Version: 3.5.1
+Version: 3.5.2-1
+Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@ -1,52 +1,46 @@
 include(vcpkg_common_functions)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "cpp-redis only supports static library linkage.")
+endif()
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Cylix/cpp_redis
-    REF 3.5.1
-    SHA512  2c50cf777d5955f7bcb94a55514fac444d0dcacc2df343dd89969889be7653a793620dbaac9d6dd0f444eee7f0664c4eb96a1d83477d207143660764afeea129
+    REF 3.5.2
+    SHA512  d19445c93fad9fba39c7aed07b2d196ec0c96366324a2a2ee856c930683b5428fe8b5bc46de4b2b23112aae83f8229a4703c2355d1c74831602ec3a7f8dac315
    HEAD_REF master
 )

+file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
+
+if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
+else()
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
+endif()
+
+# cpp-redis forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected.
+set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1")
+set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1")

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
-    OPTIONS -DUSE_CUSTOM_TCP_CLIENT=TRUE
+    OPTIONS
+        -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
 )

-vcpkg_build_cmake()
+vcpkg_install_cmake()

-file(GLOB DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
-)
-file(GLOB LIBS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
-)
-file(GLOB DEBUG_DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
-)
-file(GLOB DEBUG_LIBS
-"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
-)
-file(GLOB HEADERS "${SOURCE_PATH}/includes/cpp_redis/*.hpp" "${SOURCE_PATH}/includes/cpp_redis/*.hpp")
-if(DLLS)
-    file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-if(DEBUG_DLLS)
-    file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cpp_redis)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
+foreach(file ${FILES})
+    file(READ ${file} _contents)
+    string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}")
+    file(WRITE ${file} "${_contents}")
+endforeach()

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)

--- a/ports/cpp-redis/tacopie/CMakeLists.txt
+++ b/ports/cpp-redis/tacopie/CMakeLists.txt
@ -0,0 +1,8 @@
+find_library(TACOPIE tacopie)
+find_path(TACOPIE_H tacopie/tacopie)
+
+message(STATUS "TACOPIE_H: ${TACOPIE_H}")
+
+add_library(tacopie INTERFACE)
+target_link_libraries(tacopie INTERFACE "${TACOPIE}")
+target_include_directories(tacopie INTERFACE "${TACOPIE_H}")
--- a/ports/curl/0002_fix_uwp.patch
+++ b/ports/curl/0002_fix_uwp.patch
@ -1,20 +1,20 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed3f38a..d6480b7 100644
+index 0caf3dc..de9fcdb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1010,7 +1010,9 @@ include(CMake/OtherTests.cmake)
- add_definitions(-DHAVE_CONFIG_H)
+@@ -941,7 +941,9 @@ check_symbol_exists(ioctl          "${CURL_INCLUDES}" HAVE_IOCTL)
+ check_symbol_exists(setsockopt     "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
 
- # For windows, do not allow the compiler to use default target (Vista).
+ # symbol exists in win32, but function does not.
 -if(WIN32)
 +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 +  add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
 +elseif(WIN32)
-   add_definitions(-D_WIN32_WINNT=0x0501)
- endif(WIN32)
- 
+   if(ENABLE_INET_PTON)
+     check_function_exists(inet_pton HAVE_INET_PTON)
+     # _WIN32_WINNT_VISTA (0x0600)
 diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
-index 2591fd8..cef38ac 100644
+index 8337c72..41867b2 100644
 --- a/lib/curl_gethostname.c
 +++ b/lib/curl_gethostname.c
@@ -21,6 +21,7 @@
@ -25,7 +25,7 @@ index 2591fd8..cef38ac 100644
 
 #include "curl_gethostname.h"
 
-@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) {
+@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
 #ifdef DEBUGBUILD
 
   /* Override host name when environment variable CURL_GETHOSTNAME is set */
@ -38,10 +38,10 @@ index 2591fd8..cef38ac 100644
   }
   else {
 diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
-index 812a073..02c8416 100644
+index aea5452..c1f59f2 100644
 --- a/lib/curl_ntlm_core.c
 +++ b/lib/curl_ntlm_core.c
-@@ -696,9 +696,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
+@@ -700,9 +700,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
 
   /* Calculate the timestamp */
 #ifdef DEBUGBUILD
@ -57,40 +57,23 @@ index 812a073..02c8416 100644
 #endif
     tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
 diff --git a/lib/ftp.c b/lib/ftp.c
-index b231731..d50779f 100644
+index 6e86e53..a96fe1a 100644
 --- a/lib/ftp.c
 +++ b/lib/ftp.c
-@@ -3250,7 +3250,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
-   ssize_t nread;
-   int ftpcode;
-   CURLcode result = CURLE_OK;
-  char *path;
-+  char *path = NULL;
-   const char *path_to_use = data->state.path;
- 
-   if(!ftp)
-diff --git a/lib/smb.c b/lib/smb.c
-index 7cb0c96..2f43d3c 100644
--- a/lib/smb.c
-+++ b/lib/smb.c
-@@ -32,8 +32,12 @@
- 
- #ifdef HAVE_PROCESS_H
- #include <process.h>
-+#if defined(CURL_WINDOWS_APP)
-+#define getpid GetCurrentProcessId
-+#else
- #define getpid _getpid
- #endif
-+#endif
- 
- #include "smb.h"
- #include "urldata.h"
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index 56a8823..5a895ed 100644
--- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -197,7 +197,7 @@ unsigned int Curl_rand(struct Curl_easy *data)
+@@ -4292,7 +4292,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
+     /* prevpath is "raw" so we convert the input path before we compare the
+        strings */
+     size_t dlen;
+-    char *path;
+    char *path = NULL;
+     CURLcode result =
+       Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, FALSE);
+     if(result) {
+diff --git a/lib/rand.c b/lib/rand.c
+index 2713a0a..7da6e00 100644
+--- a/lib/rand.c
+++ b/lib/rand.c
+@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
   static bool seeded = FALSE;
 
 #ifdef CURLDEBUG
@ -98,12 +81,12 @@ index 56a8823..5a895ed 100644
 +  char *force_entropy = curl_getenv("CURL_ENTROPY");
   if(force_entropy) {
     if(!seeded) {
-       size_t elen = strlen(force_entropy);
-@@ -208,6 +208,7 @@ unsigned int Curl_rand(struct Curl_easy *data)
-     }
+       unsigned int seed = 0;
+@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
     else
       randseed++;
+     *rnd = randseed;
 +    free(force_entropy);
-     return randseed;
+     return CURLE_OK;
   }
 #endif
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@ -1,4 +1,4 @@
 Source: curl
-Version: 7.51.0-3
+Version: 7.55.0
 Build-Depends: zlib, openssl, libssh2
 Description: A library for transferring data with URLs
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@ -1,11 +1,11 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/curl-curl-7_51_0)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/curl/curl/archive/curl-7_51_0.tar.gz"
-    FILENAME "curl-7.51.0.tar.gz"
-    SHA512 88ec572efb1b2fb793dc26b627e54863718e774343283f0eb92022ce252f7798332d9d3f20f63e45c38576614a000abbf12570e91e14a118f150e0378f1a27e5
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO curl/curl
+    REF curl-7_55_0
+    SHA512 7b49e7761f5864589c6cd6eb14d8e6908797c986d8bc46a3d8dc32b7bcd12d5af464259cf3f9975a4792c8e2a504f04dd071d266d2340082a31f7ee508e17d08
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE})

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
@ -14,41 +14,40 @@ vcpkg_apply_patches(
        ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
 )

-if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    SET(CURL_STATICLIB OFF)
 else()
    SET(CURL_STATICLIB ON)
 endif()

+set(UWP_OPTIONS)
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS
-            -DBUILD_TESTING=OFF
-            -DBUILD_CURL_EXE=OFF
-            -DENABLE_MANUAL=OFF
-            -DUSE_WIN32_LDAP=OFF
-            -DCURL_DISABLE_TELNET=ON
-            -DENABLE_IPV6=OFF
-            -DENABLE_UNIX_SOCKETS=OFF
-            -DCMAKE_USE_OPENSSL=ON
-            -DCURL_STATICLIB=${CURL_STATICLIB}
-        OPTIONS_DEBUG
-            -DENABLE_DEBUG=ON
-    )
-else()
-    vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS
-            -DBUILD_TESTING=OFF
-            -DBUILD_CURL_EXE=OFF
-            -DENABLE_MANUAL=OFF
-            -DCURL_STATICLIB=${CURL_STATICLIB}
-        OPTIONS_DEBUG
-            -DENABLE_DEBUG=ON
+    set(UWP_OPTIONS
+        -DUSE_WIN32_LDAP=OFF
+        -DCURL_DISABLE_TELNET=ON
+        -DENABLE_IPV6=OFF
+        -DENABLE_UNIX_SOCKETS=OFF
    )
 endif()

+vcpkg_find_acquire_program(PERL)
+get_filename_component(PERL_PATH ${PERL} DIRECTORY)
+set(ENV{PATH} "$ENV{PATH};${PERL_PATH}")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        ${UWP_OPTIONS}
+        -DBUILD_TESTING=OFF
+        -DBUILD_CURL_EXE=OFF
+        -DENABLE_MANUAL=OFF
+        -DCURL_STATICLIB=${CURL_STATICLIB}
+        -DCMAKE_USE_OPENSSL=ON
+    OPTIONS_DEBUG
+        -DENABLE_DEBUG=ON
+)
+
 vcpkg_install_cmake()

 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright)
@ -56,6 +55,21 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    # Drop debug suffix, as FindCURL.cmake does not look for it
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
+else()
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib ${CURRENT_PACKAGES_DIR}/lib/libcurl.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
 endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)

-vcpkg_copy_pdbs()
+file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    string(REPLACE "#ifdef CURL_STATICLIB" "#if 1" CURL_H "${CURL_H}")
+else()
+    string(REPLACE "#ifdef CURL_STATICLIB" "#if 0" CURL_H "${CURL_H}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/curl/curl.h "${CURL_H}")
+
+vcpkg_copy_pdbs()
--- a/ports/double-conversion/CONTROL
+++ b/ports/double-conversion/CONTROL
@ -1,3 +1,3 @@
 Source: double-conversion
-Version: 2.0.1-1
+Version: 3.0.0
 Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
--- a/ports/double-conversion/portfile.cmake
+++ b/ports/double-conversion/portfile.cmake
@ -1,24 +1,10 @@
-# 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}
-#
-
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    # This is due to a bug in CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS on arm
-    message(STATUS "DLLs on arm aren't currently supported. Building static libs instead.")
-    set(VCPKG_LIBRARY_LINKAGE "static")
-endif()
-
 include(vcpkg_common_functions)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/double-conversion
-    REF d4d68e4e788bec89d55a6a3e33af674087837c82
-    SHA512 200b2f5ff1dfe4591f3c168e465ed154993469b7adf22b5bb2ae707d60d360ac45b51385f2d09d2a8358a914db01a790050cd9d9b78645f5ea5159410ce1de17
+    REF v3.0.0
+    SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
    HEAD_REF master
 )

@ -27,25 +13,38 @@ vcpkg_apply_patches(
    PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-arm.patch
 )

-set(OPTIONS)
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set(OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True)
-endif()
-
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
-        ${OPTIONS}
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=True
 )

 vcpkg_install_cmake()

-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
-file(RENAME ${CURRENT_PACKAGES_DIR}/CMake ${CURRENT_PACKAGES_DIR}/share/double-conversion)
-file(READ ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/double-conversion/double-conversionLibraryDepends-debug.cmake "${DEBUG_MODULE}")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake)
+# Rename exported target files into something vcpkg_fixup_cmake_targets expects
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
+            ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
+            ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
+            ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
+
+file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
+string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
+
+# Remove hardcoded paths from config file
+file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
+string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
+               "\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
+string(REPLACE "${CURRENT_PACKAGES_DIR}"
+               "\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 vcpkg_copy_pdbs()

--- a/ports/flann/CONTROL
+++ b/ports/flann/CONTROL
@ -1,3 +1,3 @@
 Source: flann
-Version: 1.9.1-4
+Version: 1.9.1-5
 Description: Fast Library for Approximate Nearest Neighbors
--- a/ports/flann/portfile.cmake
+++ b/ports/flann/portfile.cmake
@ -25,6 +25,7 @@ vcpkg_configure_cmake(
        -DBUILD_PYTHON_BINDINGS=OFF
        -DBUILD_MATLAB_BINDINGS=OFF
        -DCMAKE_DEBUG_POSTFIX=-gd
+        -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=ON
 )

 vcpkg_install_cmake()
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@ -1,4 +1,4 @@
 Source: folly
-Version: v2017.05.08.00-2
+Version: v2017.07.17.01
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: zlib, openssl, boost, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy
--- a/ports/folly/fix-cmakelists.patch
+++ b/ports/folly/fix-cmakelists.patch
@ -1,89 +0,0 @@
-diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
-index 211c6fbf..988225a2 100755
--- a/CMake/folly-deps.cmake
-+++ b/CMake/folly-deps.cmake
-@@ -11,8 +11,8 @@ find_package(Boost 1.55.0 MODULE
-   REQUIRED
- )
- find_package(DoubleConversion MODULE REQUIRED)
-find_package(GFlags MODULE REQUIRED)
-find_package(GLog MODULE REQUIRED)
-+find_package(gflags CONFIG REQUIRED)
-+find_package(glog CONFIG REQUIRED)
- find_package(LibEvent MODULE REQUIRED)
- find_package(OpenSSL MODULE REQUIRED)
- find_package(PThread MODULE)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38886d65..4c796eac 100755
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,15 +1,8 @@
- cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR)
- 
-# Unfortunately, CMake doesn't easily provide us a way to merge static
-# libraries, which is what we want to do to generate the main folly library, so
-# we do a bit of a workaround here to inject a property into the generated
-# project files that will only get enabled for the folly target. Ugly, but
-# the alternatives are far, far worse.
- if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio 15( 2017)? Win64")
-  set(CMAKE_GENERATOR_TOOLSET "v141</PlatformToolset></PropertyGroup><ItemDefinitionGroup Condition=\"'$(ProjectName)'=='folly'\"><ProjectReference><LinkLibraryDependencies>true</LinkLibraryDependencies></ProjectReference></ItemDefinitionGroup><PropertyGroup><PlatformToolset>v141")
-   set(MSVC_IS_2017 ON)
- elseif ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 14 2015 Win64")
-  set(CMAKE_GENERATOR_TOOLSET "v140</PlatformToolset></PropertyGroup><ItemDefinitionGroup Condition=\"'$(ProjectName)'=='folly'\"><ProjectReference><LinkLibraryDependencies>true</LinkLibraryDependencies></ProjectReference></ItemDefinitionGroup><PropertyGroup><PlatformToolset>v140")
-   set(MSVC_IS_2017 OFF)
- else()
-   message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.")
-@@ -122,7 +115,8 @@ add_library(folly_base STATIC
- )
- auto_source_group(folly ${FOLLY_DIR} ${files} ${hfiles})
- apply_folly_compile_options_to_target(folly_base)
-target_include_directories(folly_base PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-+target_include_directories(folly_base PUBLIC
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
- # Add the generated files to the correct source group.
- source_group("folly" FILES ${CMAKE_CURRENT_BINARY_DIR}/folly/folly-config.h)
- source_group("folly\\build" FILES
-@@ -133,10 +127,9 @@ source_group("folly\\build" FILES
- )
- 
- target_include_directories(folly_base
-  PUBLIC
-+  PRIVATE
-     ${DOUBLE_CONVERSION_INCLUDE_DIR}
-     ${LIBGFLAGS_INCLUDE_DIR}
-    ${LIBGLOG_INCLUDE_DIR}
-     ${LIBEVENT_INCLUDE_DIR}
- )
- target_link_libraries(folly_base
-@@ -151,13 +144,13 @@ target_link_libraries(folly_base
-     ${DOUBLE_CONVERSION_LIBRARY}
-     ${LIBEVENT_LIB}
-     ${LIBGFLAGS_LIBRARY}
-    ${LIBGLOG_LIBRARY}
-+    glog::glog
-     OpenSSL::SSL
-     OpenSSL::Crypto
-     Ws2_32.lib
- )
- if (FOLLY_HAVE_PTHREAD)
-  target_include_directories(folly_base PUBLIC ${LIBPTHREAD_INCLUDE_DIRS})
-+  target_include_directories(folly_base PRIVATE ${LIBPTHREAD_INCLUDE_DIRS})
-   target_link_libraries(folly_base PUBLIC ${LIBPTHREAD_LIBRARIES})
- endif()
- 
-@@ -199,13 +192,10 @@ add_library(folly ${CMAKE_CURRENT_BINARY_DIR}/folly_dep.cpp)
- apply_folly_compile_options_to_target(folly)
- source_group("" FILES ${CMAKE_CURRENT_BINARY_DIR}/folly_dep.cpp)
- 
-# Rather than list the dependencies in two places, we apply them directly on
-# the folly_base target and then copy them over to the folly target.
-get_target_property(FOLLY_LINK_LIBRARIES folly_base INTERFACE_LINK_LIBRARIES)
-target_link_libraries(folly PUBLIC ${FOLLY_LINK_LIBRARIES})
-+target_link_libraries(folly PUBLIC folly_base)
- target_include_directories(folly PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
- 
-install(TARGETS folly
-+install(TARGETS folly folly_base
-   EXPORT folly
-   RUNTIME DESTINATION bin
-   LIBRARY DESTINATION lib
--- a/ports/folly/fix-generators.patch
+++ b/ports/folly/fix-generators.patch
@ -1,36 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c796ea..684f48f 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,13 +1,5 @@
- cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR)
- 
-if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio 15( 2017)? Win64")
-  set(MSVC_IS_2017 ON)
-elseif ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 14 2015 Win64")
-  set(MSVC_IS_2017 OFF)
-else()
-  message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.")
-endif()
-
- # includes
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -24,10 +16,14 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- 
- project(${PACKAGE_NAME} CXX)
- 
-# Check architecture OS
-if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-  message(FATAL_ERROR "Folly requires a 64bit OS")
-+if (NOT MSVC_VERSION LESS 1910)
-+  set(MSVC_IS_2017 ON)
-+elseif (NOT MSVC_VERSION LESS 1900)
-+  set(MSVC_IS_2017 OFF)
-+else()
-+  message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.")
- endif()
-+
- if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-   message(FATAL_ERROR "You should only be using CMake to build Folly if you are on Windows!")
- endif()
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -17,17 +17,11 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF v2017.05.08.00
-    SHA512 1f689ec288e2a5de28223bddd68fdbb37c26c46ed9d9b831cacc46580788b9bf8eed151a043a4905172e509c70ed3d845689bf2c0cd45ce05fbe76907e2049aa
+    REF v2017.07.17.01
+    SHA512 1529941ebcc9ee3502e4ab07463bb5bc6a397259cbbf1817ac64fd186fd4cd964ffe8b473fe6a432e80632ffa553106a0d3fe2962e860eb409e3391029ed5584
    HEAD_REF master
 )

-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch"
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-generators.patch"
-)
-
 if(VCPKG_CRT_LINKAGE STREQUAL static)
    set(MSVC_USE_STATIC_RUNTIME ON)
 else()
@ -42,8 +36,7 @@ vcpkg_configure_cmake(
 )

 # Folly runs built executables during the build, so they need access to the installed DLLs.
-# TODO: Confirm it's ok that we aren't adding the debug/bin folder.
-set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin")
+set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")

 vcpkg_install_cmake(MSVC_64_TOOLSET)

@ -51,6 +44,11 @@ vcpkg_copy_pdbs()

 vcpkg_fixup_cmake_targets()

+# changes target search path
+file(READ ${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake FOLLY_MODULE)
+string(REPLACE "${CURRENT_INSTALLED_DIR}/lib/" "" FOLLY_MODULE "${FOLLY_MODULE}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake "${FOLLY_MODULE}")
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 # Handle copyright
--- a/ports/fuzzylite/CONTROL
+++ b/ports/fuzzylite/CONTROL
@ -0,0 +1,3 @@
+Source: fuzzylite
+Version: 6.0
+Description: A fuzzy logic control library in C++
--- a/ports/fuzzylite/portfile.cmake
+++ b/ports/fuzzylite/portfile.cmake
@ -0,0 +1,46 @@
+include(vcpkg_common_functions)
+
+if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO fuzzylite/fuzzylite
+    REF v6.0
+    SHA512 6f5d40d0359458e109ac2aebfbf571f61867a8b49920f4a5e1b5d86bdf578dba038b942c9e05eab0d4620f73e8cded770abe7b5e597a3b4c39dbcf6a1259f4af
+    HEAD_REF master
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(FL_BUILD_SHARED ON)
+    set(FL_BUILD_STATIC OFF)
+else()
+    set(FL_BUILD_SHARED OFF)
+    set(FL_BUILD_STATIC ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/fuzzylite
+    PREFER_NINJA
+    OPTIONS
+        -DFL_BUILD_SHARED=${FL_BUILD_SHARED}
+        -DFL_BUILD_STATIC=${FL_BUILD_STATIC}
+        -DFL_BUILD_BINARY=OFF
+        -DFL_BUILD_TESTS=OFF
+)
+
+vcpkg_build_cmake()
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fuzzylite-static.lib ${CURRENT_PACKAGES_DIR}/lib/fuzzylite.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-static-debug.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-debug.lib)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fuzzylite RENAME copyright)
--- a/ports/g2o/CONTROL
+++ b/ports/g2o/CONTROL
@ -0,0 +1,4 @@
+Source: g2o
+Version: 20170730_git-1
+Build-Depends: suitesparse, eigen3, clapack, ceres
+Description: g2o: A General Framework for Graph Optimization http://openslam.org/g2o.html
--- a/ports/g2o/portfile.cmake
+++ b/ports/g2o/portfile.cmake
@ -0,0 +1,42 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO RainerKuemmerle/g2o
+    REF 20170730_git
+    SHA512 a85e3f79e6a8bd0f81a9a1a7a01227779100d9f4ebd0ae9c03537bbdcc246018f292b53045f027bbe28ecf63b98de2f22f5528c992c93c9790eb6a3a40995903
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DG2O_BUILD_EXAMPLES=OFF
+        -DG2O_BUILD_APPS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*")
+    foreach(HEADER ${HEADERS})
+        file(READ ${HEADER} HEADER_CONTENTS)
+        string(REPLACE "#ifdef G2O_SHARED_LIBS" "#if 1" HEADER_CONTENTS "${HEADER_CONTENTS}")
+        file(WRITE ${HEADER} "${HEADER_CONTENTS}")
+    endforeach()
+endif()
+
+file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+if(EXE OR DEBUG_EXE)
+    file(REMOVE ${EXE} ${DEBUG_EXE})
+endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Put the license file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/doc/license-bsd.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/g2o/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/g2o/license-bsd.txt ${CURRENT_PACKAGES_DIR}/share/g2o/copyright)
--- a/ports/gdal/0004-Fix-openjpeg-include.patch
+++ b/ports/gdal/0004-Fix-openjpeg-include.patch
@ -0,0 +1,19 @@
+diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
+index 1fd4f4f..417f7a8 100644
+--- a/frmts/openjpeg/openjpegdataset.cpp
+++ b/frmts/openjpeg/openjpegdataset.cpp
+@@ -29,12 +29,8 @@
+ 
+ /* This file is to be used with openjpeg 2.0 */
+ 
+-#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
+-#include <openjpeg-2.1/openjpeg.h>
+-#else
+-#include <stdio.h> /* openjpeg.h needs FILE* */
+-#include <openjpeg-2.0/openjpeg.h>
+-#endif
+#include <stdio.h>
+#include <openjpeg.h>
+ #include <vector>
+ 
+ #include "gdaljp2abstractdataset.h"
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@ -1,4 +1,4 @@
 Source: gdal
-Version: 1.11.3-3
+Version: 1.11.3-4
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@ -23,6 +23,7 @@ foreach(BUILD_TYPE debug release)
        ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch
        ${CMAKE_CURRENT_LIST_DIR}/0002-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
        ${CMAKE_CURRENT_LIST_DIR}/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-openjpeg-include.patch
    )
 endforeach()

--- a/ports/glew/CONTROL
+++ b/ports/glew/CONTROL
@ -1,3 +1,3 @@
 Source: glew
-Version: 2.0.0-2
+Version: 2.1.0
 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
--- a/ports/glew/portfile.cmake
+++ b/ports/glew/portfile.cmake
@ -1,13 +1,13 @@
 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/20170423/glew-2.0.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0)

 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://sourceforge.net/projects/glew/files/glew/snapshots/glew-20170423.tgz"
-    FILENAME "glew-20170423.tgz"
-    SHA512 2d4651196e01b4db7b210fc60505bf50ac9e37b49c8eee9c9bbfeadb4cb6f87f4c907e60e708a7371ff4b7596bee51ed35a76fba76f9a13a1f32f123121f1350
+    URLS "https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.tgz"
+    FILENAME "glew-2.1.0.tgz"
+    SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
 )
-vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/20170423)
+vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew)

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}/build/cmake
--- a/ports/graphicsmagick/CMakeLists.txt
+++ b/ports/graphicsmagick/CMakeLists.txt
@ -8,7 +8,7 @@ find_package(PNG REQUIRED)
 find_package(TIFF REQUIRED)
 find_package(Freetype REQUIRED)

-add_definitions(-D_MAGICKLIB_ -DMAGICK_IMPLEMENTATION)
+add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION -D_VISUALC_)

 if (BUILD_SHARED_LIBS)
    add_definitions(-D_DLL -DDLL)
@ -79,7 +79,7 @@ add_library(graphicsmagick coders/art.c coders/avs.c
 		coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c
 		coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c
 		coders/x.c coders/xbm.c coders/xc.c coders/xcf.c
-		coders/xpm.c coders/xwd.c coders/yuv.c
+		coders/xpm.c coders/xtrn.c coders/xwd.c coders/yuv.c
 		filters/analyze.c
 		magick/analyze.c magick/animate.c magick/annotate.c magick/attribute.c
 		magick/average.c magick/bit_stream.c magick/blob.c magick/cdl.c
--- a/ports/graphicsmagick/CONTROL
+++ b/ports/graphicsmagick/CONTROL
@ -1,4 +1,4 @@
 Source: graphicsmagick
-Version: 1.3.25
+Version: 1.3.26-1
 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
 Description: Image processing library
--- a/ports/graphicsmagick/magick_types.h
+++ b/ports/graphicsmagick/magick_types.h
@ -0,0 +1,133 @@
+/*
+  Copyright (C) 2003 - 2012 GraphicsMagick Group
+ 
+  This program is covered by multiple licenses, which are described in
+  Copyright.txt. You should have received a copy of Copyright.txt with this
+  package; otherwise see http://www.graphicsmagick.org/www/Copyright.html.
+ 
+  GraphicsMagick types typedefs.
+
+  GraphicsMagick is expected to compile with any C '89 ANSI C compiler
+  supporting at least 16-bit 'short', 32-bit 'int', and 32-bit 'long'.
+  It is also expected to take advantage of 64-bit LP64 and Windows
+  WIN64 LLP64.  We use C '99 style types but declare our own types so
+  as to not depend on C '99 header files, and take care to depend only
+  on C '89 library functions, POSIX, or well-known extensions.  Any C
+  '99 syntax used is removed if the compiler does not support it.
+*/
+
+#ifndef _MAGICK_TYPES_H
+#define _MAGICK_TYPES_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/*
+  Assign ANSI C stdint.h-like typedefs based on the sizes of native types
+  magick_int8_t   --                       -128 to 127
+  magick_uint8_t  --                          0 to 255
+  magick_int16_t  --                    -32,768 to 32,767
+  magick_uint16_t --                          0 to 65,535
+  magick_int32_t  --             -2,147,483,648 to 2,147,483,647
+  magick_uint32_t --                          0 to 4,294,967,295
+  magick_int64_t  -- -9,223,372,036,854,775,807 to 9,223,372,036,854,775,807
+  magick_uint64_t --                          0 to 18,446,744,073,709,551,615
+
+  magick_uintmax_t -- largest native unsigned integer type ("%ju")
+                                              0 to UINTMAX_MAX
+                      UINTMAX_C(value) declares constant value
+  magick_uintptr_t -- unsigned type for storing a pointer value ("%tu")
+                                              0 to UINTPTR_MAX
+
+  ANSI C '99 stddef.h-like types
+  size_t           -- unsigned type representing sizes of objects ("%zu")
+                                              0 to SIZE_MAX
+  magick_ptrdiff_t -- signed type for subtracting two pointers ("%td")
+                                    PTRDIFF_MIN to PTRDIFF_MAX
+
+  EEE Std 1003.1, 2004 types
+  ssize_t          -- signed type for a count of bytes or an error indication ("%zd")
+                                              ? to SSIZE_MAX
+*/
+
+#if (defined(WIN32) || defined(WIN64)) && \
+  !defined(__MINGW32__) && !defined(__MINGW64__)
+
+  /* The following typedefs are used for WIN32 & WIN64 (without
+     configure) */
+  typedef signed char   magick_int8_t;
+  typedef unsigned char  magick_uint8_t;
+
+  typedef signed short  magick_int16_t;
+  typedef unsigned short magick_uint16_t;
+
+  typedef signed int  magick_int32_t;
+#  define MAGICK_INT32_F ""
+  typedef unsigned int magick_uint32_t;
+#  define MAGICK_UINT32_F ""
+
+  typedef signed __int64  magick_int64_t;
+# define MAGICK_INT64_F "I64"
+  typedef unsigned __int64 magick_uint64_t;
+# define MAGICK_UINT64_F "I64"
+
+  typedef magick_uint64_t magick_uintmax_t;
+
+#  if defined(WIN32)
+  typedef unsigned long magick_uintptr_t;
+#  define MAGICK_SIZE_T_F "l"
+#  define MAGICK_SIZE_T unsigned long
+#  define MAGICK_SSIZE_T_F "l"
+#  define MAGICK_SSIZE_T long
+#  elif defined(WIN64)
+  /* WIN64 uses the LLP64 model */
+  typedef unsigned long long magick_uintptr_t;
+#  define MAGICK_SIZE_T_F "I64"
+#  define MAGICK_SIZE_T unsigned __int64
+#  define MAGICK_SSIZE_T_F "I64"
+#  define MAGICK_SSIZE_T signed __int64
+#  endif
+
+#else
+
+  /* The following typedefs are subtituted when using Unixish configure */
+  typedef @INT8_T@   magick_int8_t;
+  typedef @UINT8_T@  magick_uint8_t;
+
+  typedef @INT16_T@  magick_int16_t;
+  typedef @UINT16_T@ magick_uint16_t;
+
+  typedef @INT32_T@  magick_int32_t;
+#  define MAGICK_INT32_F @INT32_F@
+  typedef @UINT32_T@ magick_uint32_t;
+#  define MAGICK_UINT32_F @UINT32_F@
+
+  typedef @INT64_T@  magick_int64_t;
+#  define MAGICK_INT64_F @INT64_F@
+  typedef @UINT64_T@ magick_uint64_t;
+#  define MAGICK_UINT64_F @UINT64_F@
+
+  typedef @UINTMAX_T@ magick_uintmax_t;
+#  define MAGICK_UINTMAX_F @UINTMAX_F@
+
+  typedef @UINTPTR_T@ magick_uintptr_t;
+#  define MAGICK_UINTPTR_F @UINTPTR_F@
+
+#  define MAGICK_SIZE_T_F @MAGICK_SIZE_T_F@
+#  define MAGICK_SIZE_T @MAGICK_SIZE_T@
+
+#  define MAGICK_SSIZE_T_F @MAGICK_SSIZE_T_F@
+#  define MAGICK_SSIZE_T @MAGICK_SSIZE_T@
+
+#endif
+
+  /* 64-bit file and blob offset type */
+  typedef magick_int64_t magick_off_t;
+#define MAGICK_OFF_F MAGICK_INT64_F
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif /* defined(__cplusplus) || defined(c_plusplus) */
+
+#endif /* _MAGICK_TYPES_H */
--- a/ports/graphicsmagick/portfile.cmake
+++ b/ports/graphicsmagick/portfile.cmake
@ -1,16 +1,17 @@
 include(vcpkg_common_functions)

-set(GM_VERSION 1.3.25)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/graphicsmagick-${GM_VERSION})
+set(GM_VERSION 1.3.26)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/graphicsmagick-${GM_VERSION}-windows-source)

 vcpkg_download_distfile(ARCHIVE
-    URLS "https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.25/GraphicsMagick-${GM_VERSION}.tar.bz2"
-    FILENAME "GraphicsMagick-${GM_VERSION}.tar.bz2"
-    SHA512 718802f675988ae36122e8a5f88c74754fa610ec2b4d4630772db7d8898c2e48117ea85fd6741c0b6f256f6f4d68abb642cdeddfb3d330ae1ab2951920cdc1a3
-)
+    URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
+    FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
+    SHA512 c45a054d082d9a7a2889a2235dd5b96bd564acf55bd581426ecd32c426f9797d7d56d6e5f25a5a7da8ebd26bf0d962372b5d48d86532dc6c57522d27c0d18ec8
+    )
 vcpkg_extract_source_archive(${ARCHIVE})

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick)

 # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined
 vcpkg_apply_patches(
--- a/ports/hypre/CONTROL
+++ b/ports/hypre/CONTROL
@ -1,4 +1,4 @@
 Source: hypre
-Version: 2.11.1
+Version: 2.11.2
 Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS
 Build-Depends: msmpi
--- a/ports/hypre/fix-root-cmakelists.patch
+++ b/ports/hypre/fix-root-cmakelists.patch
@ -1,5 +1,5 @@
--- a/CMakeLists.txt	Thu Jun 09 15:56:18 2016
-+++ b/CMakeLists.txt	Wed Jan 04 18:27:54 2017
+--- a/CMakeLists.txt	Mon Mar 13 21:37:24 2017
+++ b/CMakeLists.txt	Sun Aug 06 19:34:00 2017
@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 2.8.8)
 project (hypre)
@ -7,9 +7,9 @@
 +include(GenerateExportHeader)
 +
 # The version number.
- set (HYPRE_VERSION 2.11.1)
- set (HYPRE_DATE    2016/06/09)
-@@ -616,6 +618,8 @@
+ set (HYPRE_VERSION 2.11.2)
+ set (HYPRE_DATE    2017/03/13)
+@@ -618,6 +620,8 @@
   struct_ls/sparse_msg_solve.c
 )
 
@ -18,7 +18,7 @@
 # Headers and sources: sstruct_mv
 list (APPEND HYPRE_HEADERS
   sstruct_mv/HYPRE_sstruct_mv.h
-@@ -756,11 +760,11 @@
+@@ -758,11 +762,11 @@
   find_package (MPI)
   if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER))
     include_directories (${MPI_C_INCLUDE_PATH})
@ -32,14 +32,16 @@
   endif ()
 endif (NOT HYPRE_SEQUENTIAL)
 
-@@ -802,8 +806,19 @@
- endif ()
+@@ -807,7 +811,23 @@
 
 add_library (HYPRE ${HYPRE_SOURCES} ${FEI_LIBS})
-
+ 
 -install (TARGETS HYPRE DESTINATION lib)
-+target_link_libraries(HYPRE ${MPI_C_LIBRARIES})
-+if(WIN32 AND BUILD_SHARED_LIBS)
+if (NOT HYPRE_SEQUENTIAL)
+  target_link_libraries(HYPRE ${MPI_C_LIBRARIES})
+endif()
+
+if (WIN32 AND BUILD_SHARED_LIBS)
 +  set_target_properties(HYPRE PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 +endif()
 +
@ -51,6 +53,7 @@
 +  LIBRARY DESTINATION lib
 +  ARCHIVE DESTINATION lib
 +)
+
 install (FILES ${HYPRE_HEADERS} DESTINATION include)
 
 # add_subdirectory (test EXCLUDE_FROM_ALL)
--- a/ports/hypre/portfile.cmake
+++ b/ports/hypre/portfile.cmake
@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hypre-2.11.1/src)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hypre-2.11.2/src)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.1.tar.gz"
-    FILENAME "hypre-2.11.1.tar.gz"
-    SHA512 4266c1b5225bcc97781246475100382f4929d7c918c854570a36b90602e8f111a4893cd1c93b95c68305c851898b970dd92ac173efe9211be5bb914d3c3c5d83
+    URLS "http://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/hypre-2.11.2.tar.gz"
+    FILENAME "hypre-2.11.2.tar.gz"
+    SHA512 a06321028121e5420fa944ce4fae5f9b96e6021ec2802e68ec3c349f19a20543ed7eff774a4735666c5807ce124eb571b3f86757c67e91faa1c683c3f657469f
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/ilmbase/portfile.cmake
+++ b/ports/ilmbase/portfile.cmake
@ -9,7 +9,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION})
 vcpkg_download_distfile(ARCHIVE
    URLS "http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILM_VERSION}.tar.gz"
-    FILENAME "ilmbase-${ILM_VERSION}.zip"
+    FILENAME "ilmbase-${ILM_VERSION}.tar.gz"
    SHA512 ${ILM_HASH})

 vcpkg_extract_source_archive(${ARCHIVE})
--- a/ports/jemalloc/CONTROL
+++ b/ports/jemalloc/CONTROL
@ -0,0 +1,4 @@
+Source: jemalloc
+Version: 4.3.1-1
+Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
+Build-Depends:
--- a/ports/jemalloc/fix-cmakelists.patch
+++ b/ports/jemalloc/fix-cmakelists.patch
@ -0,0 +1,67 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06e83ef..229e17a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ option(enable-lazy-lock "Enable lazy locking (only lock when multi-threaded" OFF
+ option(force_lazy_lock "Forcing lazy-lock to avoid allocator/threading bootstrap issues" OFF)
+ # install_prefix - installation directory prefix
+ # with-xslroot=<path>  XSL stylesheet root path
+option(build-tests "Build tests" OFF)
+ 
+ set (PACKAGE_NAME "jemalloc")
+ project (${PACKAGE_NAME} C)
+@@ -711,12 +712,8 @@ endif()
+ 
+ # The original library, delivery product
+ set(LIBJEMALLOCLIB jemalloc${install_suffix})
+-add_library(${LIBJEMALLOCLIB} STATIC ${C_SRCS})
+-
+-# Now add shared library. Needed for integration tests
+-# and a benchmark
+-set(LIBJEMALLOCSO jemallocso${install_suffix})
+-add_library(${LIBJEMALLOCSO} SHARED ${C_SRCS})
+set(LIBJEMALLOCSO ${LIBJEMALLOCLIB})
+add_library(${LIBJEMALLOCLIB} ${C_SRCS})
+ 
+ if(WIN32)
+   # May want to replace  /d2Zi+ to /Zo
+@@ -745,8 +745,6 @@ if(WIN32)
+   # either impport or export which is both wrong for a static library
+   set_target_properties(${LIBJEMALLOCLIB}
+            PROPERTIES
+-           COMPILE_DEFINITIONS
+-           "JEMALLOC_EXPORT="
+            CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG
+            ${PROJECT_BINARY_DIR}/Debug
+            CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE
+@@ -754,6 +752,9 @@ if(WIN32)
+            COMPILE_PDB_NAME
+            ${LIBJEMALLOCLIB}
+   )
+  if(NOT BUILD_SHARED_LIBS)
+    target_compile_definitions(${LIBJEMALLOCLIB} "JEMALLOC_EXPORT=")
+  endif()
+
+ endif()
+ 
+@@ -825,6 +822,14 @@ if(C_UTIL_INTEGRATION_DEFS)
+         "${C_UTIL_INTEGRATION_DEFS}")
+ endif()
+ 
+install(FILES include/jemalloc/jemalloc${install_suffix}.h
+        DESTINATION include/jemalloc)
+
+install(TARGETS ${LIBJEMALLOCSO}
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
+if (build-tests)
+ ##################################################################
+ # Common source for Unit, Integration and stress test libraries
+ set(C_TESTLIB_SRCS
+@@ -1028,4 +1033,4 @@ foreach(sourcefile ${TESTS_INTEGRATION})
+   add_test(NAME ${exename} COMMAND ${exename})
+   add_dependencies(check ${exename})
+ endforeach(sourcefile ${TESTS_UNIT})
+-
+endif()
--- a/ports/jemalloc/fix-utilities.patch
+++ b/ports/jemalloc/fix-utilities.patch
@ -0,0 +1,30 @@
+diff --git a/Utilities.cmake b/Utilities.cmake
+index 562e948..d2d3530 100644
+--- a/Utilities.cmake
+++ b/Utilities.cmake
+@@ -633,9 +633,11 @@ file(TO_NATIVE_PATH "${file_path}" ntv_file_path)
+ # This converts #undefs into #cmakedefines so configure_file can handle it
+ set(PS_CMD
+ "Get-Content \"${ntv_file_path}\" |
+-ForEach { 
+ForEach {
+ if($_ -match '^#undef[ \t]*[^ \t]*')
+-  { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}}"
+  { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}
+} |
+Set-Content \"${ntv_file_path}.cmake\""
+ )
+ 
+ if(EXISTS ${file_path})
+@@ -646,9 +648,8 @@ if(EXISTS ${file_path})
+     # Convert autoconf .in into a cmake .in
+     execute_process(COMMAND powershell -Command "${PS_CMD}" 
+         RESULT_VARIABLE error_level
+-        ERROR_VARIABLE error_output
+-        OUTPUT_FILE ${file_path}.cmake)
+-        
+        ERROR_VARIABLE error_output)
+
+     if(NOT ${error_level} EQUAL 0)
+         message(FATAL_ERROR "Powershell completed with ${error_level} : ${error_output}")
+     endif()
--- a/ports/jemalloc/portfile.cmake
+++ b/ports/jemalloc/portfile.cmake
@ -0,0 +1,36 @@
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jemalloc/jemalloc-cmake
+    REF jemalloc-cmake.4.3.1
+    SHA512 e94b62ec3a53acc0ab5acb247d7646bc172108e80f592bb41c2dd50d181cbbeb33d623adf28415ffc0a0e2de3818af2dfe4c04af75ac891ef5042bc5bb186886
+    HEAD_REF master
+)
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/fix-utilities.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jemalloc)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/jemalloc/COPYING ${CURRENT_PACKAGES_DIR}/share/jemalloc/copyright)
--- a/ports/libkml/CONTROL
+++ b/ports/libkml/CONTROL
@ -0,0 +1,4 @@
+Source: libkml
+Version: 1.3.0
+Description: Reference implementation of OGC KML 2.2
+Build-Depends: zlib, boost, expat, minizip, uriparser
--- a/ports/libkml/patch_empty_literal_on_vc.patch
+++ b/ports/libkml/patch_empty_literal_on_vc.patch
@ -0,0 +1,13 @@
+diff --git a/src/kml/base/file_win32.cc b/src/kml/base/file_win32.cc
+index c46e099..28ccb36 100644
+--- a/src/kml/base/file_win32.cc
+++ b/src/kml/base/file_win32.cc
+@@ -42,7 +42,7 @@ namespace kmlbase {
+ // Internal to the win32 file class. We need a conversion from string to
+ // LPCWSTR.
+ static std::wstring Str2Wstr(const string& str) {
+-  std::wstring wstr(str.length(), L'');
+  std::wstring wstr(str.length(), L' ');
+   std::copy(str.begin(), str.end(), wstr.begin());
+   return wstr;
+ }
--- a/ports/libkml/portfile.cmake
+++ b/ports/libkml/portfile.cmake
@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libkml/libkml
+    REF   1.3.0
+    SHA512 aa48158103d3af764bf98c1fb4cf3e1356b9cc6c8e79d80b96850916f0a8ccb1dac3a46427735dd0bf20647daa047d10e722ac3da2a214d4c1559bf6d5d7c853
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/patch_empty_literal_on_vc.patch"
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libkml RENAME copyright)
--- a/ports/libtheora/0001-fix-uwp.patch
+++ b/ports/libtheora/0001-fix-uwp.patch
@ -0,0 +1,53 @@
+From 47eb8d07a8caaa6cc1e6e906a7cd5b44ee0fb624 Mon Sep 17 00:00:00 2001
+From: Mikhail Paulyshka <me@mixaill.tk>
+Date: Thu, 27 Jul 2017 04:24:36 +0300
+Subject: [PATCH] remove redundant assignments
+
+---
+ lib/tokenize.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/lib/tokenize.c b/lib/tokenize.c
+index 57b7aa8..3f53fb5 100644
+--- a/lib/tokenize.c
+++ b/lib/tokenize.c
+@@ -487,11 +487,11 @@ int oc_enc_tokenize_ac(oc_enc_ctx *_enc,int _pli,ptrdiff_t _fragi,
+   zzj=64;
+   for(zzi=OC_MINI(_zzi,63);zzi>0;zzi--){
+     ogg_uint32_t best_cost;
+-    int          best_bits=best_bits;
+-    int          best_next=best_next;
+-    int          best_token=best_token;
+-    int          best_eb=best_eb;
+-    int          best_qc=best_qc;
+    int          best_bits;
+    int          best_next;
+    int          best_token;
+    int          best_eb;
+    int          best_qc;
+     ogg_uint32_t d2;
+     int          dq;
+     int          qc_m;
+@@ -1091,8 +1091,8 @@ void oc_enc_tokenize_dc_frag_list(oc_enc_ctx *_enc,int _pli,
+   int                neobs1;
+   int                token;
+   int                eb;
+-  int                token1=token1;
+-  int                eb1=eb1;
+  int                token1;
+  int                eb1;
+   /*Return immediately if there are no coded fragments; otherwise we'd flush
+      any trailing EOB run into the AC 1 list and never read it back out.*/
+   if(_ncoded_fragis<=0)return;
+@@ -1328,7 +1328,7 @@ void oc_enc_tokenize_finish(oc_enc_ctx *_enc){
+     int       new_eb;
+     int       zzj;
+     int       plj;
+-    ptrdiff_t ti=ti;
+    ptrdiff_t ti;
+     int       run_count;
+     /*Make sure this coefficient has tokens at all.*/
+     if(_enc->ndct_tokens[pli][zzi]<=0)continue;
+-- 
+2.12.2.windows.2
+
--- a/ports/libtheora/CMakeLists.txt
+++ b/ports/libtheora/CMakeLists.txt
@ -1,67 +1,91 @@
-project(theora)
+cmake_minimum_required(VERSION 3.0)
+project(theora LANGUAGES C)

 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
 FIND_PACKAGE(OGG REQUIRED)

 file(GLOB HEADERS
-"include/theora/codec.h"
-"include/theora/theora.h"
-"include/theora/theoradec.h"
+  "include/theora/codec.h"
+  "include/theora/theora.h"
+  "include/theora/theoradec.h"
+  "include/theora/theoraenc.h"
 )

-
 include_directories("include")
 include_directories(${OGG_INCLUDE_DIR})

-file(GLOB SOURCES
-"lib/analyze.c"
-"lib/encapiwrapper.c"
-"lib/encfrag.c"
-"lib/encinfo.c"
-"lib/encode.c"
-#"lib/encoder_disabled.c"
-"lib/enquant.c"
-"lib/fdct.c"
-"lib/huffenc.c"
-"lib/mathops.c"
-"lib/mcenc.c"
-"lib/rate.c"
-"lib/tokenize.c"
-"lib/x86_vc/mmxencfrag.c"
-"lib/x86_vc/mmxfdct.c"
-"lib/x86_vc/x86cpu.c"
-"lib/x86_vc/x86enc.c"
-"lib/apiwrapper.c"
-"lib/bitpack.c"
-"lib/decapiwrapper.c"
-"lib/decinfo.c"
-"lib/decode.c"
-"lib/dequant.c"
-"lib/fragment.c"
-"lib/huffdec.c"
-"lib/idct.c"
-"lib/info.c"
-"lib/internal.c"
-"lib/quant.c"
-"lib/state.c"
-"lib/x86_vc/mmxfrag.c"
-"lib/x86_vc/mmxidct.c"
-"lib/x86_vc/mmxstate.c"
-"lib/x86_vc/x86state.c"
-"win32/xmingw32/libtheoradec-all.def"
+set(LIBTHEORA_COMMON
+  "lib/apiwrapper.c"
+  "lib/bitpack.c"
+  "lib/dequant.c"
+  "lib/fragment.c"
+  "lib/idct.c"
+  "lib/info.c"
+  "lib/internal.c"
+  "lib/state.c"
+  "lib/quant.c"
+
+  "lib/x86_vc/mmxfrag.c"
+  "lib/x86_vc/mmxidct.c"
+  "lib/x86_vc/mmxstate.c"
+  "lib/x86_vc/x86cpu.c"
+  "lib/x86_vc/x86state.c"
 )

-add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_BIND_TO_CURRENT_CRT_VERSION)
-if (${BUILD_SHARED_LIBS})
-	add_definitions(-DLIBTHEORA_EXPORTS)
+set(LIBTHEORA_ENC
+  "lib/analyze.c"
+  "lib/encapiwrapper.c"
+  "lib/encfrag.c"
+  "lib/encinfo.c"
+  "lib/encode.c"
+  "lib/enquant.c"
+  "lib/fdct.c"
+  "lib/huffenc.c"
+  "lib/mathops.c"
+  "lib/mcenc.c"
+  "lib/rate.c"
+  "lib/tokenize.c"
+
+  "lib/x86_vc/mmxencfrag.c"
+  "lib/x86_vc/mmxfdct.c"
+  "lib/x86_vc/x86enc.c"
+)
+
+set(LIBTHEORA_DEC
+  "lib/decapiwrapper.c"
+  "lib/decinfo.c"
+  "lib/decode.c"
+  "lib/huffdec.c"
+)
+
+add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+
+option(USE_X86 "Use x86 optimization" OFF)
+if(USE_X86)
+  add_definitions(-DOC_X86_ASM)
 endif()

-add_library(theora ${SOURCES} ${HEADERS})
+if (${BUILD_SHARED_LIBS})
+  add_definitions(-DLIBTHEORA_EXPORTS)
+endif()
+
+add_library(theora-common OBJECT ${LIBTHEORA_COMMON} ${HEADERS})
+add_library(theora-enc OBJECT ${LIBTHEORA_ENC} ${HEADERS})
+add_library(theora-dec OBJECT ${LIBTHEORA_DEC} ${HEADERS})
+
+add_library(theora $<TARGET_OBJECTS:theora-common> $<TARGET_OBJECTS:theora-enc> $<TARGET_OBJECTS:theora-dec> "libtheora.def")
 target_link_libraries(theora ${OGG_LIBRARY})

+add_library(theoraenc $<TARGET_OBJECTS:theora-common> $<TARGET_OBJECTS:theora-enc> "win32/xmingw32/libtheoraenc-all.def")
+target_link_libraries(theoraenc ${OGG_LIBRARY})
+
+add_library(theoradec $<TARGET_OBJECTS:theora-common> $<TARGET_OBJECTS:theora-dec> "win32/xmingw32/libtheoradec-all.def")
+target_link_libraries(theoradec ${OGG_LIBRARY})
+
 install(FILES ${HEADERS} DESTINATION include/theora)

-install(TARGETS theora
+install(TARGETS theora theoraenc theoradec
  RUNTIME DESTINATION bin
  LIBRARY DESTINATION bin
  ARCHIVE DESTINATION lib
--- a/ports/libtheora/CONTROL
+++ b/ports/libtheora/CONTROL
@ -1,4 +1,4 @@
 Source: libtheora
-Version: 1.1.1
+Version: 1.2.0alpha1-20170719~vcpkg1
 Description: Theora is a free and open video compression format from the Xiph.org Foundation.
 Build-Depends: libogg
--- a/ports/libtheora/libtheora.def
+++ b/ports/libtheora/libtheora.def
@ -0,0 +1,61 @@
+EXPORTS
+; Old alpha API
+	theora_version_string
+	theora_version_number
+	theora_decode_header
+	theora_decode_init
+	theora_decode_packetin
+	theora_decode_YUVout
+	theora_control
+	theora_packet_isheader
+	theora_packet_iskeyframe
+	theora_granule_shift
+	theora_granule_frame
+	theora_granule_time
+	theora_info_init
+	theora_info_clear
+	theora_clear
+	theora_comment_init
+	theora_comment_add
+	theora_comment_add_tag
+	theora_comment_query
+	theora_comment_query_count
+	theora_comment_clear
+; New theora-exp API
+	th_version_string
+	th_version_number
+	th_decode_headerin
+	th_decode_alloc
+	th_setup_free
+	th_decode_ctl
+	th_decode_packetin
+	th_decode_ycbcr_out
+	th_decode_free
+	th_packet_isheader
+	th_packet_iskeyframe
+	th_granule_frame
+	th_granule_time
+	th_info_init
+	th_info_clear
+	th_comment_init
+	th_comment_add
+	th_comment_add_tag
+	th_comment_query
+	th_comment_query_count
+	th_comment_clear
+; Old alpha API
+	theora_encode_init
+	theora_encode_YUVin
+	theora_encode_packetout
+	theora_encode_header
+	theora_encode_comment
+	theora_encode_tables
+; New theora-exp API
+	th_encode_alloc
+	th_encode_ctl
+	th_encode_flushheader
+	th_encode_ycbcr_in
+	th_encode_packetout
+	th_encode_free
+	TH_VP31_QUANT_INFO
+	TH_VP31_HUFF_CODES
--- a/ports/libtheora/portfile.cmake
+++ b/ports/libtheora/portfile.cmake
@ -1,31 +1,41 @@
-# 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)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libtheora-1.1.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2"
-    FILENAME "libtheora-1.1.1.tar.bz2"
-    SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO xiph/theora
+    REF fa5707d68c2a4338d58aa8b6afc95539ba89fecb
+    SHA512 e33da23a17e93709dfe4421b512cedbd9aab0d706f5650e0436f9c8e1cde76b902c3338d46750bb86d83e1bceb111ee84e90df36fb59b5c2e7f7aee1610752b2
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp.patch
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/libtheora.def DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOGG.cmake DESTINATION ${SOURCE_PATH})

+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(THEORA_X86_OPT ON)
+else()
+    set(THEORA_X86_OPT OFF)
+endif()
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DUSE_X86=${THEORA_X86_OPT}
 )

+vcpkg_build_cmake()
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-# Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtheora)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtheora/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtheora/copyright)
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@ -25,7 +25,7 @@ vcpkg_find_acquire_program(PERL)
 vcpkg_acquire_msys(MSYS_ROOT)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "${PERL_EXE_PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH}")
+set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
 set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

 message(STATUS "Installing MSYS Packages")
--- a/ports/minizip/CONTROL
+++ b/ports/minizip/CONTROL
@ -1,4 +1,4 @@
 Source: minizip
-Version: 1.2.11
+Version: 1.2.11-1
 Description:
 Build-Depends: bzip2, zlib
--- a/ports/minizip/portfile.cmake
+++ b/ports/minizip/portfile.cmake
@ -24,5 +24,11 @@ vcpkg_install_cmake()
 vcpkg_copy_pdbs()

 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip)
+file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h")
+foreach(HEADER ${HEADERS})
+  file(READ "${HEADER}" _contents)
+  string(REPLACE "#ifdef HAVE_BZIP2" "#if 1" _contents "${_contents}")
+  file(WRITE "${HEADER}" "${_contents}")
+endforeach()

 file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/minizip RENAME copyright)
--- a/ports/msgpack/CONTROL
+++ b/ports/msgpack/CONTROL
@ -1,3 +1,3 @@
 Source: msgpack
-Version: 2.1.1
+Version: 2.1.5
 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.
--- a/ports/msgpack/add-static-lib-option.patch
+++ b/ports/msgpack/add-static-lib-option.patch
@ -0,0 +1,84 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f92363e..b0becbb 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -196,27 +196,28 @@ IF (MSGPACK_ENABLE_SHARED)
+             ${CMAKE_CURRENT_SOURCE_DIR}
+     )
+ ENDIF ()
+IF (MSGPACK_ENABLE_STATIC)
+    ADD_LIBRARY (msgpackc-static STATIC
+        ${msgpackc_SOURCES}
+        ${msgpackc_HEADERS}
+    )
+ 
+-ADD_LIBRARY (msgpackc-static STATIC
+-    ${msgpackc_SOURCES}
+-    ${msgpackc_HEADERS}
+-)
+-
+-TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+-    PUBLIC
+-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+-        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+-        $<INSTALL_INTERFACE:include>
+-    PRIVATE
+-        ${CMAKE_CURRENT_SOURCE_DIR}
+-)
+    TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+        PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc" COMPILE_DEFINITIONS MSGPACK_DLLEXPORT=)
+ENDIF ()
+ 
+-IF (NOT MSGPACK_ENABLE_SHARED)
+IF (MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_SHARED)
+     # Add alias for subdirectories
+     ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
+ ENDIF ()
+ 
+-SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
+ IF (MSGPACK_ENABLE_SHARED)
+     IF (MSVC)
+         SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
+@@ -239,14 +240,18 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST
+     IF (MSGPACK_ENABLE_SHARED)
+         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC")
+     ENDIF ()
+-    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
+    IF (MSGPACK_ENABLE_STATIC)
+        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" )
+    ENDIF ()
+ ENDIF ()
+ 
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+     IF (MSGPACK_ENABLE_SHARED)
+         SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+     ENDIF ()
+-    SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+    IF (MSGPACK_ENABLE_STATIC)
+        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+    ENDIF ()
+ ENDIF ()
+ 
+ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+@@ -278,10 +283,12 @@ IF (MSGPACK_BUILD_EXAMPLES)
+     ADD_SUBDIRECTORY (example)
+ ENDIF ()
+ 
+-IF (MSGPACK_ENABLE_SHARED)
+IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
+     SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static)
+-ELSE()
+ELSEIF (MSGPACK_ENABLE_STATIC)
+     SET (MSGPACK_INSTALLTARGETS msgpackc-static)
+ELSE ()
+    SET (MSGPACK_INSTALLTARGETS msgpackc)
+ ENDIF ()
+ 
+ INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
--- a/ports/msgpack/portfile.cmake
+++ b/ports/msgpack/portfile.cmake
@ -1,30 +1,34 @@
 include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO msgpack/msgpack-c
+    REF cpp-2.1.5
+    SHA512 aab8357e494bb5aa7407b53e5e650382869ea95812a6677e085530d5f27cde6946fbfd0095b19608c75163dbb82de9ccb6a695234e7c03659fc6efc2da300e19
+    HEAD_REF master)

-set(MSGPACK_VERSION 2.1.1)
-set(MSGPACK_HASH 31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msgpack-${MSGPACK_VERSION})
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/msgpack/msgpack-c/releases/download/cpp-${MSGPACK_VERSION}/msgpack-${MSGPACK_VERSION}.tar.gz"
-    FILENAME "msgpack-${MSGPACK_VERSION}.tar.gz"
-    SHA512 ${MSGPACK_HASH}
-)
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-static-lib-option.patch)

 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    set(MSGPACK_ENABLE_SHARED OFF)
+    set(MSGPACK_ENABLE_STATIC ON)
 else()
    set(MSGPACK_ENABLE_SHARED ON)
+    set(MSGPACK_ENABLE_STATIC OFF)
 endif()

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
-    OPTIONS -DMSGPACK_ENABLE_SHARED=${MSGPACK_ENABLE_SHARED}
-)
+    OPTIONS
+        -DMSGPACK_ENABLE_SHARED=${MSGPACK_ENABLE_SHARED}
+        -DMSGPACK_ENABLE_STATIC=${MSGPACK_ENABLE_STATIC}
+        -DMSGPACK_BUILD_EXAMPLES=OFF
+        -DMSGPACK_BUILD_TESTS=OFF)

 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/msgpack)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

--- a/ports/msmpi/CONTROL
+++ b/ports/msmpi/CONTROL
@ -1,3 +1,3 @@
 Source: msmpi
-Version: 8.0-1
+Version: 8.1
 Description: Microsoft MPI
--- a/ports/msmpi/portfile.cmake
+++ b/ports/msmpi/portfile.cmake
@ -1,18 +1,26 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-8.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-8.1)

 vcpkg_download_distfile(SDK_ARCHIVE
-    URLS "https://download.microsoft.com/download/B/2/E/B2EB83FE-98C2-4156-834A-E1711E6884FB/msmpisdk.msi"
-    FILENAME "msmpisdk-8.0.msi"
-    SHA512 49c762873ba777ccb3c959a1d2ca1392e4c3c8d366e604ad707184ea432302e6649894ec6599162d0d40f3e6ebc0dada1eb9ca0da1cde0f6ba7a9b1847dac8c0
+    URLS "https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/msmpisdk.msi"
+    FILENAME "msmpisdk-8.1.msi"
+    SHA512 a0cfb713865257b812c19644286fc0d02ec57ce2a0bea066fead4e0ff18b545a0787065ab748f8dd335bb2fa486911aab54c1b842993b7b685c5832c014a63bf
 )

+macro(download_msmpi_redistributable_package)
+    vcpkg_download_distfile(REDIST_ARCHIVE
+        URLS "https://download.microsoft.com/download/D/B/B/DBB64BA1-7B51-43DB-8BF1-D1FB45EACF7A/MSMpiSetup.exe"
+        FILENAME "MSMpiSetup-8.1.exe"
+        SHA512 92ae65f3d52e786e39dffedabdf48255b4985a075993e626f5f59674e9ffaedbf33a4725e8f142b21468e24cd6d3e49f3d91da0fbda1867784cc93300c12c96b
+    )
+endmacro()
+
 ### Check for correct version of installed redistributable package

 # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder)
 vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS)
 set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe")
-set(MSMPI_EXPECTED_FULL_VERSION "8.0.12438.0")
+set(MSMPI_EXPECTED_FULL_VERSION "8.1.12438.1084")

 if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH})
    set(MPIEXEC_VERSION_LOGNAME "mpiexec-version")
@ -25,10 +33,15 @@ if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH})

    if(${MPIEXEC_OUTPUT} MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)\\]")
        if(NOT ${CMAKE_MATCH_1} STREQUAL ${MSMPI_EXPECTED_FULL_VERSION})
+            download_msmpi_redistributable_package()
+
            message(FATAL_ERROR
                "  The version of the installed MSMPI redistributable packages does not match the version to be installed\n"
-                "  Expected version: ${MSMPI_EXPECTED_FULL_VERSION}\n"
-                "  Found version: ${CMAKE_MATCH_1}\n")
+                "    Expected version: ${MSMPI_EXPECTED_FULL_VERSION}\n"
+                "    Found version: ${CMAKE_MATCH_1}\n"
+                "  Please upgrade the installed version on your system.\n"
+                "  The appropriate installer for the expected version has been downloaded to:\n"
+                "    ${REDIST_ARCHIVE}\n")
        endif()
    else()
        message(FATAL_ERROR
@ -38,11 +51,7 @@ if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH})
            "    ${CURRENT_BUILDTREES_DIR}\\${MPIEXEC_VERSION_LOGNAME}-err.log\n")
    endif()
 else()
-    vcpkg_download_distfile(REDIST_ARCHIVE
-        URLS "https://download.microsoft.com/download/B/2/E/B2EB83FE-98C2-4156-834A-E1711E6884FB/MSMpiSetup.exe"
-        FILENAME "MSMpiSetup-8.0.exe"
-        SHA512 f5271255817f5417de8e432cd21e5ff3c617911a30b7777560c0ceb6f4031ace5fa88fc7675759ae0964bcf4e2076fe367a06c129f3a9ad06871a08bf95ed68b
-    )
+    download_msmpi_redistributable_package()

    message(FATAL_ERROR
        "  Could not find:\n"
@ -56,8 +65,15 @@ file(TO_NATIVE_PATH "${SDK_ARCHIVE}" SDK_ARCHIVE)
 file(TO_NATIVE_PATH "${SOURCE_PATH}/sdk" SDK_SOURCE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec-${TARGET_TRIPLET}.log" MSIEXEC_LOG_PATH)

+set(PARAM_MSI "/a \"${SDK_ARCHIVE}\"")
+set(PARAM_LOG "/log \"${MSIEXEC_LOG_PATH}\"")
+set(PARAM_TARGET_DIR "TARGETDIR=\"${SDK_SOURCE_DIR}\"")
+set(SCRIPT_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat)
+# Write the command out to a script file and run that to avoid weird escaping behavior when spaces are present
+file(WRITE ${SCRIPT_FILE} "msiexec ${PARAM_MSI} /qn ${PARAM_LOG} ${PARAM_TARGET_DIR}")
+
 vcpkg_execute_required_process(
-    COMMAND msiexec /a ${SDK_ARCHIVE} /qn TARGETDIR=${SDK_SOURCE_DIR} /log "${MSIEXEC_LOG_PATH}"
+    COMMAND ${SCRIPT_FILE}
    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
    LOGNAME extract-sdk
 )
--- a/ports/openal-soft/CONTROL
+++ b/ports/openal-soft/CONTROL
@ -1,3 +1,3 @@
 Source: openal-soft
-Version: 1.18.0
+Version: 1.18.1
 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.
--- a/ports/openal-soft/portfile.cmake
+++ b/ports/openal-soft/portfile.cmake
@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO kcat/openal-soft
-    REF openal-soft-1.18.0
-    SHA512 b3f1ac7eaaef38ef960cdfaf7bd475c32258f752718e762333188837ab33eb6e3f9a39776138a52a434dec42157ffba10f0592ef8d3ec3b023a5261e05832a69
+    REF openal-soft-1.18.1
+    SHA512 6e9d65dafbd77ca5d7badb1999b08a104e9c7e6c6637fb9ccca946de5bdfc6266de9d316ce06a979c94309ac9e0e5c1fac27b2673297f9062ef67f0e8a54e39c
    HEAD_REF master
 )

--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@ -1,3 +1,3 @@
 Source: openblas
-Version: v0.2.19-2
+Version: v0.2.20
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
--- a/ports/openblas/install-openblas.patch
+++ b/ports/openblas/install-openblas.patch
@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ff42643..1a013ee 100644
+index a379f549..f95a872b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ enable_language(ASM)
- enable_language(C)
+@@ -16,7 +16,7 @@ enable_language(C)
+ include(GNUInstallDirs)
 
 if(MSVC)
 -set(OpenBLAS_LIBNAME libopenblas)
@ -11,7 +11,7 @@ index ff42643..1a013ee 100644
 else()
 set(OpenBLAS_LIBNAME openblas)
 endif()
-@@ -174,6 +174,10 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
+@@ -197,6 +197,10 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
   SOVERSION ${OpenBLAS_MAJOR_VERSION}
 )
 
@ -22,3 +22,40 @@ index ff42643..1a013ee 100644
 
 # TODO: Why is the config saved here? Is this necessary with CMake?
 #Save the config files for installation
+diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
+index a7f98bfb..02ab7080 100644
+--- a/cmake/prebuild.cmake
+++ b/cmake/prebuild.cmake
+@@ -37,6 +37,10 @@
+ 
+ # CPUIDEMU = ../../cpuid/table.o
+ 
+if (NOT DEFINED BLASHELPER_BINARY_DIR)
+  set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
+endif ()
+
+ if (DEFINED CPUIDEMU)
+   set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
+ endif ()
+@@ -95,8 +99,8 @@ endif ()
+ message(STATUS "Running getarch")
+ 
+ # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
+ 
+ message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
+ 
+@@ -121,8 +125,8 @@ if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+ endif ()
+ 
+ # use the cmake binary w/ the -E param to run a shell command in a cross-platform way
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
+-execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
+execute_process(COMMAND ${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
+ 
+ # append config data from getarch_2nd to the TARGET file and read in CMake vars
+ file(APPEND ${TARGET_CONF} ${GETARCH2_CONF_OUT})
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@ -12,7 +12,6 @@

 include(vcpkg_common_functions)

-
 if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
    message(FATAL_ERROR "openblas can only be built for x64 currently")
 endif()
@ -22,11 +21,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    set(VCPKG_LIBRARY_LINKAGE "dynamic")
 endif()

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openblas-0.2.19)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openblas-0.2.20)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://codeload.github.com/xianyi/OpenBLAS/zip/v0.2.19"
-    FILENAME "openblas-v0.2.19.zip"
-    SHA512 d95dcd1ca5b3bdc5355969d10c22486f7e32f7dfc3a418b5d0a979d030e9f2ed242d2d78267a5896aa83d27b6041e13ee4c6694f9a589765535011eb22dad9e2
+    URLS "https://codeload.github.com/xianyi/OpenBLAS/zip/v0.2.20"
+    FILENAME "openblas-v0.2.20.zip"
+    SHA512 c9cd7397bb026e3bb06c9407ad5ac26bf936258da81ac22132ceceb53c0235677e18a6046f1db8a75c8a92a614b2d156a3da89d684421a24bd283430ce55db7d
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -35,20 +34,61 @@ vcpkg_apply_patches(
    PATCHES "${CMAKE_CURRENT_LIST_DIR}/install-openblas.patch"
 )

+find_program(GIT NAMES git git.cmd)
+
+# sed and awk are installed with git but in a different directory
+get_filename_component(GIT_EXE_PATH ${GIT} DIRECTORY)
+set(SED_EXE_PATH "${GIT_EXE_PATH}/../usr/bin")
+
 # openblas require perl to generate .def for exports
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}")
+set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}")

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
-    # PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
+# for UWP version, must build non uwp first for helper
+# binaries.
+if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
+    message(STATUS "Building Windows helper files")
+    set(TEMP_CMAKE_SYSTEM_NAME "${VCPKG_CMAKE_SYSTEM_NAME}")
+    set(TEMP_CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}")
+    set(TEMP_TARGET_TRIPLET "${TARGET_TRIPLET}")
+    unset(VCPKG_CMAKE_SYSTEM_NAME)
+    unset(VCPKG_CMAKE_SYSTEM_VERSION)
+    set(TARGET_TRIPLET "x64-windows")
+
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
+    )
+
+    # add just built path to environment for gen_config_h.exe,
+    # getarch.exe and getarch_2nd.exe
+    set(ENV{PATH} "$ENV{PATH};${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+
+    # restore target build information
+    set(VCPKG_CMAKE_SYSTEM_NAME "${TEMP_CMAKE_SYSTEM_NAME}")
+    set(VCPKG_CMAKE_SYSTEM_VERSION "${TEMP_CMAKE_SYSTEM_VERSION}")
+    set(TARGET_TRIPLET "${TEMP_TARGET_TRIPLET}")
+
+    message(STATUS "Finished building Windows helper files")
+
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON 
+        "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
+
+else()
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
+        # PREFER_NINJA # Disable this option if project cannot be built with Ninja
+        # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+        # OPTIONS_RELEASE -DOPTIMIZE=1
+        # OPTIONS_DEBUG -DDEBUGGABLE=1
 )

+endif()
+

 vcpkg_install_cmake()

@ -65,7 +105,9 @@ string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}")

 # openblas is BSD
-file(COPY ${CURRENT_BUILDTREES_DIR}/src/OpenBLAS-0.2.19/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openblas)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openblas)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/openblas/LICENSE ${CURRENT_PACKAGES_DIR}/share/openblas/copyright)

 vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
--- a/ports/openexr/portfile.cmake
+++ b/ports/openexr/portfile.cmake
@ -5,7 +5,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openexr-${OPENEXR_VERSION})
 vcpkg_download_distfile(ARCHIVE
    URLS "http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz"
-    FILENAME "openexr-${OPENEXR_VERSION}.zip"
+    FILENAME "openexr-${OPENEXR_VERSION}.tar.gz"
    SHA512 ${OPENEXR_HASH})

 vcpkg_extract_source_archive(${ARCHIVE})
--- a/ports/openjpeg/CONTROL
+++ b/ports/openjpeg/CONTROL
@ -1,3 +1,3 @@
 Source: openjpeg
-Version: 2.1.2-2
+Version: 2.2.0
 Description: JPEG 2000 image library
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@ -1,17 +1,18 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openjpeg-2.1.2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/uclouvain/openjpeg/archive/v2.1.2.zip"
-    FILENAME "openjpeg-2.1.2.zip"
-    SHA512 45518b92b2a8e7218ab3efdebe1acf0437c01ab2e4d5769da17103a76ba38a7305fb36d0ceeca0576d53c071a3482d2d3f01d6e48a569191290bfba9274ef7b4
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO uclouvain/openjpeg
+    REF v2.2.0
+    SHA512 20651c380bee582ab1950994c424cc00061ad852e9c5438fb32a9809e3f275571a4cc7e92589add0d91debf2394262e58f441c2dd918809fc1c602ed68396a3a
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
    OPTIONS -DBUILD_CODEC:BOOL=OFF
            -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg
+            -DOPENJPEG_INSTALL_INCLUDE_DIR=include
 )

 vcpkg_install_cmake()
@ -20,14 +21,14 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 vcpkg_fixup_cmake_targets()

-file(READ ${CURRENT_PACKAGES_DIR}/include/openjpeg-2.1/openjpeg.h OPENJPEG_H)
+file(READ ${CURRENT_PACKAGES_DIR}/include/openjpeg.h OPENJPEG_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
    string(REPLACE "defined(OPJ_STATIC)" "1" OPENJPEG_H "${OPENJPEG_H}")
 else()
    string(REPLACE "defined(OPJ_STATIC)" "0" OPENJPEG_H "${OPENJPEG_H}")
 endif()
 string(REPLACE "defined(DLL_EXPORT)" "0" OPENJPEG_H "${OPENJPEG_H}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/openjpeg-2.1/openjpeg.h "${OPENJPEG_H}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/openjpeg.h "${OPENJPEG_H}")

 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openjpeg)
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@ -7,20 +7,10 @@ include(vcpkg_common_functions)
 set(OPENSSL_VERSION 1.0.2l)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})

+vcpkg_find_acquire_program(PERL)
 vcpkg_find_acquire_program(NASM)
 find_program(NMAKE nmake)

-vcpkg_acquire_msys(MSYS_ROOT)
-set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
-
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl"
-    WORKING_DIRECTORY ${MSYS_ROOT}
-    LOGNAME pacman-${TARGET_TRIPLET}
-)
-
-set(PERL ${MSYS_ROOT}/usr/bin/perl.exe)
-
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
 vcpkg_find_acquire_program(JOM)
@ -65,11 +55,11 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)


-message(STATUS "Build ${TARGET_TRIPLET}-rel")
 file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
 set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION})
 set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})

+message(STATUS "Configure ${TARGET_TRIPLET}-rel")
 vcpkg_execute_required_process(
    COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
@ -80,6 +70,9 @@ vcpkg_execute_required_process(
    WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
 )
+message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
+
+message(STATUS "Build ${TARGET_TRIPLET}-rel")
 # Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
 # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
 make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
@ -97,7 +90,7 @@ vcpkg_execute_required_process(
 message(STATUS "Build ${TARGET_TRIPLET}-rel done")


-message(STATUS "Build ${TARGET_TRIPLET}-dbg")
+message(STATUS "Configure ${TARGET_TRIPLET}-dbg")
 file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION})
 set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
@ -112,6 +105,9 @@ vcpkg_execute_required_process(
    WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
    LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
 )
+message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")
+
+message(STATUS "Build ${TARGET_TRIPLET}-dbg")
 make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl)
 execute_process(
    COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
--- a/ports/opusfile/CONTROL
+++ b/ports/opusfile/CONTROL
@ -1,4 +1,4 @@
 Source: opusfile
-Version: 0.8
+Version: 0.9
 Description: Stand-alone decoder library for .opus streams
 Build-Depends: libogg, opus, openssl
--- a/ports/opusfile/portfile.cmake
+++ b/ports/opusfile/portfile.cmake
@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO xiph/opusfile
-    REF v0.8
-    SHA512 82fcb09c0b77bffb5877c660a268e0c166a1ac314b270799fe5cb4e0fa2cd10fd909b380761031f7dfb60d8b7561e5fe54d93b74d37bb0e6f629bdf9a6384ae1
+    REF v0.9
+    SHA512 8bada67cf12511fd914813fe782a5bf40a5d1ecadbe77e2e8d7bf40bf09bf0e6af3dfbc9b7987496dea813d3b120897cb9117f06521eeb098105e1a795ab702b
    HEAD_REF master)

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@ -0,0 +1,4 @@
+Source: pcl
+Version: 1.8.1
+Build-Depends: boost, eigen3, flann, qhull, vtk, openni2, qt5
+Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
--- a/ports/pcl/config.patch
+++ b/ports/pcl/config.patch
@ -0,0 +1,63 @@
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index f4ef6a0ff..3a2c259dc 100644
+--- a/PCLConfig.cmake.in
+++ b/PCLConfig.cmake.in
+@@ -155,7 +155,7 @@ macro(find_qhull)
+     NAMES "@QHULL_LIBRARY_DEBUG_NAME@"
+     HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
+     PATHS "$ENV{PROGRAMFILES}/qhull" "$ENV{PROGRAMW6432}/qhull" 
+-    PATH_SUFFIXES project build bin lib)
+    PATH_SUFFIXES project build bin debug/lib)
+   
+   find_package_handle_standard_args(qhull DEFAULT_MSG QHULL_LIBRARY QHULL_INCLUDE_DIRS)
+ 
+@@ -443,7 +443,7 @@ macro(find_flann)
+     HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}"
+     PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" 
+           "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann"
+-    PATH_SUFFIXES lib)
+    PATH_SUFFIXES debug/lib)
+ 
+   find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS)
+   if(FLANN_FOUND)
+@@ -715,25 +715,18 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR)
+ if(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/cmake
+   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+  get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
+ else(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+   get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+ endif(WIN32 AND NOT MINGW)
+ 
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
+-if(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
+if(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
+   # Found a PCL installation
+   # pcl_message("Found a PCL installation")
+-  set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
+-  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@")
+-  if(EXISTS "${PCL_ROOT}/3rdParty")
+-    set(PCL_ALL_IN_ONE_INSTALLER ON)
+-  endif(EXISTS "${PCL_ROOT}/3rdParty")
+-elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
+-  # Found a non-standard (likely ANDROID) PCL installation
+-  # pcl_message("Found a PCL installation")
+   set(PCL_INCLUDE_DIRS "${PCL_ROOT}/include")
+-  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib")
+  set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@")
+   if(EXISTS "${PCL_ROOT}/3rdParty")
+     set(PCL_ALL_IN_ONE_INSTALLER ON)
+   endif(EXISTS "${PCL_ROOT}/3rdParty")
+@@ -743,9 +736,9 @@ elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h")
+   set(PCL_INCLUDE_DIRS "${PCL_DIR}/include") # for pcl_config.h
+   set(PCL_LIBRARY_DIRS "${PCL_DIR}/@LIB_INSTALL_DIR@")
+   set(PCL_SOURCES_TREE "@CMAKE_SOURCE_DIR@")
+-else(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
+else(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
+   pcl_report_not_found("PCL can not be found on this machine")  
+-endif(EXISTS "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}/pcl/pcl_config.h")
+endif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h")
+ 
+ #set a suffix for debug libraries
+ set(PCL_DEBUG_SUFFIX "@CMAKE_DEBUG_POSTFIX@")
--- a/ports/pcl/config_install.patch
+++ b/ports/pcl/config_install.patch
@ -0,0 +1,22 @@
+diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
+index 69f1e76a4..37305815e 100644
+--- a/cmake/pcl_utils.cmake
+++ b/cmake/pcl_utils.cmake
+@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS)
+   endif (NOT DEFINED LIB_INSTALL_DIR)
+     if(NOT ANDROID)
+       set(INCLUDE_INSTALL_ROOT
+-          "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
+          "include")
+     else(NOT ANDROID)
+       set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
+     endif(NOT ANDROID)
+@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS)
+     set(BIN_INSTALL_DIR "bin")
+     set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
+     if(WIN32 AND NOT MINGW)
+-        set(PCLCONFIG_INSTALL_DIR "cmake")
+        set(PCLCONFIG_INSTALL_DIR "share/pcl")
+       else(WIN32 AND NOT MINGW)
+         set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
+       endif(WIN32 AND NOT MINGW)
--- a/ports/pcl/find_flann.patch
+++ b/ports/pcl/find_flann.patch
@ -0,0 +1,15 @@
+diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake
+index b5739dc95..4041a2539 100644
+--- a/cmake/Modules/FindFLANN.cmake
+++ b/cmake/Modules/FindFLANN.cmake
+@@ -10,8 +10,8 @@
+ # look for shared ones
+ 
+ if(FLANN_USE_STATIC)
+-  set(FLANN_RELEASE_NAME flann_cpp_s)
+-  set(FLANN_DEBUG_NAME flann_cpp_s-gd)
+  set(FLANN_RELEASE_NAME flann_cpp)
+  set(FLANN_DEBUG_NAME flann_cpp-gd)
+ else(FLANN_USE_STATIC)
+   set(FLANN_RELEASE_NAME flann_cpp)
+   set(FLANN_DEBUG_NAME flann_cpp-gd)
--- a/ports/pcl/find_openni2.patch
+++ b/ports/pcl/find_openni2.patch
@ -0,0 +1,12 @@
+diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
+index 713099a14..f31de96a6 100644
+--- a/cmake/Modules/FindOpenNI2.cmake
+++ b/cmake/Modules/FindOpenNI2.cmake
+@@ -51,6 +51,7 @@ find_path(OPENNI2_INCLUDE_DIRS OpenNI.h
+     PATHS
+     "$ENV{OPENNI2_INCLUDE${OPENNI2_SUFFIX}}"  # Win64 needs '64' suffix
+     /usr/include/openni2  # common path for deb packages
+    PATH_SUFFIXES include/openni2
+ )
+ 
+ find_library(OPENNI2_LIBRARY
--- a/ports/pcl/find_qhull.patch
+++ b/ports/pcl/find_qhull.patch
@ -0,0 +1,13 @@
+diff --git a/cmake/Modules/FindQhull.cmake b/cmake/Modules/FindQhull.cmake
+index 698bd151b..44c1d5d8d 100644
+--- a/cmake/Modules/FindQhull.cmake
+++ b/cmake/Modules/FindQhull.cmake
+@@ -55,7 +55,7 @@ find_library(QHULL_LIBRARY_DEBUG
+              NAMES ${QHULL_DEBUG_NAME} ${QHULL_RELEASE_NAME}
+              HINTS "${QHULL_ROOT}" "$ENV{QHULL_ROOT}"
+              PATHS "$ENV{PROGRAMFILES}/QHull" "$ENV{PROGRAMW6432}/QHull" 
+-             PATH_SUFFIXES project build bin lib)
+             PATH_SUFFIXES project build bin debug/lib)
+ 
+ if(NOT QHULL_LIBRARY_DEBUG)
+   set(QHULL_LIBRARY_DEBUG ${QHULL_LIBRARY})
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@ -0,0 +1,65 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO PointCloudLibrary/pcl
+    REF pcl-1.8.1
+    SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/config.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/config_install.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/find_flann.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/find_qhull.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/find_openni2.patch"
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(LIBRARY_LINKAGE ON)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(LIBRARY_LINKAGE OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        # BUILD
+        -DBUILD_surface_on_nurbs=ON
+        -DBUILD_tools=OFF
+        # PCL
+        -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32=${LIBRARY_LINKAGE}
+        -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=${LIBRARY_LINKAGE}
+        -DPCL_SHARED_LIBS=${LIBRARY_LINKAGE}
+        # WITH
+        -DWITH_CUDA=OFF
+        -DWITH_LIBUSB=OFF
+        -DWITH_OPENNI2=ON
+        -DWITH_PCAP=OFF
+        -DWITH_PNG=OFF
+        -DWITH_QHULL=ON
+        -DWITH_QT=ON
+        -DWITH_VTK=ON
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pcl)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pcl/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/pcl/copyright)
--- a/ports/physfs/CONTROL
+++ b/ports/physfs/CONTROL
@ -1,3 +1,4 @@
 Source: physfs
-Version: 2.0.3
+Version: 2.0.3-1
 Description: a library to provide abstract access to various archives
+Build-Depends: zlib
--- a/ports/physfs/export-symbols-in-shared-build-only.patch
+++ b/ports/physfs/export-symbols-in-shared-build-only.patch
@ -0,0 +1,13 @@
+diff --git a/physfs.h b/physfs.h
+index 3c252c6..4319981 100644
+--- a/physfs.h
+++ b/physfs.h
+@@ -221,7 +221,7 @@ extern "C" {
+ #endif
+ 
+ #ifndef DOXYGEN_SHOULD_IGNORE_THIS
+-#if (defined _MSC_VER)
+#if (defined _MSC_VER && defined (physfs_EXPORTS))
+ #define __EXPORT__ __declspec(dllexport)
+ #elif (__GNUC__ >= 3)
+ #define __EXPORT__ __attribute__((visibility("default")))
--- a/ports/physfs/portfile.cmake
+++ b/ports/physfs/portfile.cmake
@ -1,32 +1,32 @@
-# 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}
-#
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/physfs-2.0.3)
+set(PHYSFS_VERSION 2.0.3)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/physfs-${PHYSFS_VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2"
-    FILENAME "physfs-2.0.3.tar.bz2"
+    URLS "https://icculus.org/physfs/downloads/physfs-${PHYSFS_VERSION}.tar.bz2"
+    FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2"
    SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
 )
 vcpkg_extract_source_archive(${ARCHIVE})

+vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/export-symbols-in-shared-build-only.patch)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) 
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC}
+        -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED}
+        -DPHYSFS_BUILD_TEST=OFF
 )

 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/test_physfs.exe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/test_physfs.exe)

 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/physfs)
--- a/ports/plog/CONTROL
+++ b/ports/plog/CONTROL
@ -0,0 +1,3 @@
+Source: plog
+Version: 1.1.3
+Description: Portable, simple and extensible C++ logging library.
--- a/ports/plog/portfile.cmake
+++ b/ports/plog/portfile.cmake
@ -0,0 +1,17 @@
+# Header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO SergiusTheBest/plog
+    REF 1.1.3
+    SHA512 9a5a455e1942158d2802313682ed007750789a9048773302d92f2591dfac0185914dba8b67fa285fed25e54dff44e2c97c92b9e7decd39fa2bca460c03549377
+    HEAD_REF master
+)
+
+# Put the licence file where vcpkg expects it
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/plog)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/plog/LICENSE ${CURRENT_PACKAGES_DIR}/share/plog/copyright)
+
+# Copy header files
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h")
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@ -1,4 +1,4 @@
 Source: qt5
-Version: 5.8-3
+Version: 5.8-4
 Description: Qt5 application framework main components. Webengine, examples and tests not included.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@ -87,6 +87,8 @@ vcpkg_execute_required_process(
    LOGNAME fix-cmake
 )

+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
 file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/qt5 RENAME copyright)
 if(EXISTS ${CURRENT_PACKAGES_DIR}/plugins)
    file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/qtdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/plugins)
--- a/ports/sciter/CONTROL
+++ b/ports/sciter/CONTROL
@ -1,4 +1,4 @@
 Source: sciter
-Version: 4.0.1.1
+Version: 4.0.2-1
 Description: Sciter is an embeddable HTML/CSS/scripting engine.
 Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com
--- a/ports/sciter/portfile.cmake
+++ b/ports/sciter/portfile.cmake
@ -12,9 +12,9 @@ include(vcpkg_common_functions)
 # header-only library
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)

-set(SCITER_VERSION 4.0.1.1)
-set(SCITER_REVISION 5caaf6f5bd408fd45c30deb873ce76ae7af53819)
-set(SCITER_SHA 88d332891a98fd80200ae04a7b5cc72a6edcbc123abe8147a17ac8e4189fbc4b7ed58f7acc06a6683ec3f1ed74e133115c35599751f6a31358b911e07b602ec4)
+set(SCITER_VERSION 4.0.2-1)
+set(SCITER_REVISION 2d1de5b6d9da55b50168cb9069c8b12490f39d60)
+set(SCITER_SHA 3d33bd0f76474b76e2281b96517c26ac1bb4b8009847499c063c0066a8e69280019c133a10967be8aaed97bbd6186023728619233dea6e7bcf1567e45cd57017)

 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
    set(SCITER_ARCH 64)
--- a/ports/stb/CONTROL
+++ b/ports/stb/CONTROL
@ -1,3 +1,3 @@
 Source: stb
-Version: 1.0
+Version: 20170724-9d9f75e
 Description: stb single-file public domain libraries for C/C++
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@ -1,12 +1,12 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/stb-e713a69f1ea6ee1e0d55725ed0731520045a5993)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/nothings/stb/archive/e713a69f1ea6ee1e0d55725ed0731520045a5993.zip"
-    FILENAME "stb-e713a69f1ea6ee1e0d55725ed0731520045a5993.zip"
-    SHA512 28d73905e626bf286bc42e30bc50e8449912a9db5e421e09bfbd17790de1909fe9df19c96d6ad3125a6ae0947d45b11b83ee5965dab68d1eadd0c332e391400e
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nothings/stb
+    REF 9d9f75eb682dd98b34de08bb5c489c6c561c9fa6
+    SHA512 e710385b1de9b07108c1a0628e74832e163729d95d529a6fe333156cc8e518af47e480761c2f9acd69cffbc14e477952d7e5b208708ffbd3870949dccf315b4f
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/stb/README.md)
--- a/ports/tacopie/CONTROL
+++ b/ports/tacopie/CONTROL
@ -1,3 +1,3 @@
 Source: tacopie
-Version: 2.4.1
+Version: 2.4.1-1
 Description: Tacopie is a TCP Client & Server C++11 library
--- a/ports/tacopie/portfile.cmake
+++ b/ports/tacopie/portfile.cmake
@ -1,5 +1,9 @@
 include(vcpkg_common_functions)

+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "cpp-redis only supports static library linkage.")
+endif()
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Cylix/tacopie
@ -8,44 +12,26 @@ vcpkg_from_github(
    HEAD_REF master
 )

+if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
+else()
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
+endif()
+
+# tacopie forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected.
+set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1")
+set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1")

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
+    OPTIONS
+        -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
 )

-vcpkg_build_cmake()
+vcpkg_install_cmake()

-file(GLOB DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
-)
-file(GLOB LIBS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
-)
-file(GLOB DEBUG_DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
-)
-file(GLOB DEBUG_LIBS
-"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
-)
-file(GLOB HEADERS "${SOURCE_PATH}/includes/tacopie/*.hpp" "${SOURCE_PATH}/includes/tacopie/*.hpp")
-if(DLLS)
-    file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-if(DEBUG_DLLS)
-    file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/tacopie)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tacopie RENAME copyright)

--- a/ports/uwebsockets/CONTROL
+++ b/ports/uwebsockets/CONTROL
@ -1,4 +1,4 @@
 Source: uwebsockets
-Version: 0.14.3
+Version: 0.14.4
 Build-Depends: libuv, openssl, zlib, boost
 Description: Highly scalable cross-platform WebSocket & HTTP library for C++11 and Node.js
--- a/ports/uwebsockets/portfile.cmake
+++ b/ports/uwebsockets/portfile.cmake
@ -1,10 +1,10 @@
 include(vcpkg_common_functions)
-set(VERSION 0.14.3)
+set(VERSION 0.14.4)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/uwebsockets-${VERSION})
 vcpkg_download_distfile(ARCHIVE
    URLS "https://github.com/uWebSockets/uWebSockets/archive/v${VERSION}.zip"
    FILENAME "uwebsockets-v${VERSION}.zip"
-    SHA512 a64a6ee91d411f4285deb10b9b7620b4c4a2ff0f8137864380968349f7786c406ba44644b6ca589ee41c1e5adfa1ee1cf3697e54ecf5d459ab8bf69a3a4def7e
+    SHA512 cc395437790a51a729582897111304e7d6c72574d59c55929a686b6a8a489eb3ea3ea7f037aeda9083243317ed885bd710a708d3dd635220387d3253e0712b10
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@ -1,4 +1,4 @@
 Source: vtk
-Version: 7.1.1-1
+Version: 8.0.0-1
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi, libjpeg-turbo, proj, lz4, libtheora
--- a/ports/vtk/SplitLibraryConfigurations.cmake
+++ b/ports/vtk/SplitLibraryConfigurations.cmake
@ -0,0 +1,28 @@
+
+cmake_minimum_required(VERSION 3.2.0)
+
+function(split_library_configurations LIBRARIES OPTIMIZED_OUT_VAR DEBUG_OUT_VAR GENERAL_OUT_VAR)
+  set(OPTIMIZED_LIBRARIES)
+  set(DEBUG_LIBRARIES)
+  set(GENERAL_LIBRARIES)
+
+  set(CURRENT_TYPE)
+  foreach(LIBRARY ${LIBRARIES})
+    if("${LIBRARY}" STREQUAL "optimized" OR "${LIBRARY}" STREQUAL "debug" OR "${LIBRARY}" STREQUAL "general")
+      set(CURRENT_TYPE "${LIBRARY}")
+    else()
+      if("${CURRENT_TYPE}" STREQUAL "optimized")
+        list(APPEND OPTIMIZED_LIBRARIES "${LIBRARY}")
+      elseif("${CURRENT_TYPE}" STREQUAL "debug")
+        list(APPEND DEBUG_LIBRARIES "${LIBRARY}")
+      else()
+        list(APPEND GENERAL_LIBRARIES "${LIBRARY}")
+      endif()
+      set(CURRENT_TYPE)
+    endif()
+  endforeach()
+
+  set(${OPTIMIZED_OUT_VAR} "${OPTIMIZED_LIBRARIES}" PARENT_SCOPE)
+  set(${DEBUG_OUT_VAR} "${DEBUG_LIBRARIES}" PARENT_SCOPE)
+  set(${GENERAL_OUT_VAR} "${GENERAL_LIBRARIES}" PARENT_SCOPE)
+endfunction()
--- a/ports/vtk/disable-workaround-findhdf5.patch
+++ b/ports/vtk/disable-workaround-findhdf5.patch
@ -1,13 +1,11 @@
-diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake
-index fdd83ed8fc..4986582a5b 100644
--- a/CMake/vtkModuleMacros.cmake
-+++ b/CMake/vtkModuleMacros.cmake
-@@ -885,18 +885,6 @@ macro(vtk_module_third_party _pkg)
-       set(vtk${_lower}_DEFINITIONS ${${_upper}_DEFINITIONS})
+--- a/CMake/vtkModuleMacros.cmake	Mon Jun 26 15:29:04 2017
+++ b/CMake/vtkModuleMacros.cmake	Tue Aug 08 17:54:03 2017
+@@ -893,18 +893,6 @@
+       set(vtk${_lower}_LIBRARIES "${${_upper_pkg_name}_LIBRARIES}")
     endif()
 
 -    #a workaround for bad FindHDF5 behavior in which deb or opt can
-    #end up empty. cmake >= 2.8.12.2 makes this uneccessary
+-    #end up empty. cmake >= 2.8.12.2 makes this unnecessary
 -    string(REGEX MATCH "debug;.*optimized;.*"
 -           _remove_deb_opt "${vtk${_lower}_LIBRARIES}")
 -    if (_remove_deb_opt)
--- a/ports/vtk/fix-find-libproj4.patch
+++ b/ports/vtk/fix-find-libproj4.patch
@ -0,0 +1,68 @@
+--- a/CMake/FindLIBPROJ4.cmake	Thu Aug 10 21:03:55 2017
+++ b/CMake/FindLIBPROJ4.cmake	Thu Aug 10 21:08:58 2017
+@@ -11,7 +11,7 @@
+     file( TO_CMAKE_PATH "$ENV{LIBPROJ4_DIR}" _LIBPROJ4_DIR )
+   endif ()
+ 
+-  find_library( LIBPROJ4_LIBRARIES
+  find_library( LIBPROJ4_LIBRARY_RELEASE
+     NAMES proj
+     PATHS
+       ${_LIBPROJ4_DIR}/lib64
+@@ -24,7 +24,21 @@
+       ${CMAKE_INSTALL_PREFIX}/lib
+       /usr/local/lib
+       /usr/lib
+-    NO_DEFAULT_PATH
+  )
+
+  find_library( LIBPROJ4_LIBRARY_DEBUG
+    NAMES projd
+    PATHS
+      ${_LIBPROJ4_DIR}/lib64
+      ${CMAKE_INSTALL_PREFIX}/lib64
+      /usr/local/lib64
+      /usr/lib64
+      ${_LIBPROJ4_DIR}
+      ${_LIBPROJ4_DIR}/lib
+      ${CMAKE_INSTALL_PREFIX}/bin
+      ${CMAKE_INSTALL_PREFIX}/lib
+      /usr/local/lib
+      /usr/lib
+   )
+ 
+   find_path( LIBPROJ4_INCLUDE_DIR
+@@ -37,19 +51,22 @@
+       /usr/local/include
+       /usr/include
+       /usr/include/postgresql
+-    NO_DEFAULT_PATH
+   )
+ 
+-  if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
+-    if ( LIBPROJ4_REQUIRED )
+-      message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
+-    endif ()
+-  else ()
+-    set( LIBPROJ4_FOUND 1 )
+-    mark_as_advanced( LIBPROJ4_FOUND )
+-  endif ()
+  include(SelectLibraryConfigurations)
+  select_library_configurations(LIBPROJ4)
+  
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(LIBPROJ4
+                                    REQUIRED_VARS LIBPROJ4_LIBRARY LIBPROJ4_INCLUDE_DIR)
+
+  if(LIBPROJ4_FOUND)
+    set(LIBPROJ4_INCLUDE_DIRS ${LIBPROJ4_INCLUDE_DIR})
+ 
+    if(NOT LIBPROJ4_LIBRARIES)
+      set(LIBPROJ4_LIBRARIES ${LIBPROJ4_LIBRARY})
+    endif()
+  endif()
+ endif ()
+ 
+-mark_as_advanced( FORCE LIBPROJ4_INCLUDE_DIR )
+-mark_as_advanced( FORCE LIBPROJ4_LIBRARIES )
+mark_as_advanced(LIBPROJ4_INCLUDE_DIR)
--- a/ports/vtk/netcdf-use-hdf5-definitions.patch
+++ b/ports/vtk/netcdf-use-hdf5-definitions.patch
@ -1,10 +0,0 @@
--- a/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt	Mon Nov 14 17:59:47 2016
-+++ b/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt	Thu Jan 05 21:15:28 2017
-@@ -330,6 +330,7 @@
-     ${netcdf_dispatch_SOURCES}
-     ${netcdf_liblib_SOURCES})
- target_link_libraries(vtkNetCDF ${vtkhdf5_LIBRARIES})
-+target_compile_definitions(vtkNetCDF PRIVATE ${vtkhdf5_DEFINITIONS})
- 
- if (UNIX)
-   # link against the math library.
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@ -1,29 +1,42 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/VTK-7.1.1)
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.vtk.org/files/release/7.1/VTK-7.1.1.tar.gz"
-    FILENAME "VTK-7.1.1.tar.gz"
-    SHA512 34a068801fe45f98325e5334d2569fc9b15ed38620386f1b5b860c9735e5fb8510953b50a3340d3ef9795e22fecf798c25bf750215b2ff1ff1eb7a1ecd87b623
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "Kitware/VTK"
+    REF "v8.0.0"
+    SHA512 1a328f24df0b1c40c623ae80c9d49f8b27570144b10af02aeed41b90b50b8d4e0dd83d1341961f6818cde36e2cd793c578ebc95a46950cebfc518f486f249791
+    HEAD_REF "master"
 )
-vcpkg_extract_source_archive(${ARCHIVE})

 vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/transfer-3rd-party-module-definitions.patch
-        ${CMAKE_CURRENT_LIST_DIR}/transfer-hdf5-definitions.patch
-        ${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch
+        # Disable ssize_t because this can conflict with ssize_t that is defined on windows.
        ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-findhdf5-shared.patch
+
+        # We force CMake to use it's own version of the FindHDF5 module since newer versions
+        # shipped with CMake behave differently. E.g. the one shipped with CMake 3.9 always
+        # only finds the release libraries, but not the debug libraries.
+        # The file shipped with CMake allows us to set the libraries explicitly as it is done below.
+        # Maybe in the future we can disable the patch and use the new version shipped with CMake
+        # together with the hdf5-config.cmake that is written by HDF5 itself, but currently VTK
+        # disables taking the config into account explicitly.
+        ${CMAKE_CURRENT_LIST_DIR}/use-fixed-find-hdf5.patch
+
+        # We disable a workaround in the VTK CMake scripts that can lead to the fact that a dependency
+        # will link to both, the debug and the release library.
        ${CMAKE_CURRENT_LIST_DIR}/disable-workaround-findhdf5.patch
+
+        ${CMAKE_CURRENT_LIST_DIR}/fix-find-libproj4.patch
 )

+# Remove the FindGLEW.cmake that is distributed with VTK, since it does not
+# detect the debug libraries correctly.
+# The default file distributed with CMake should be superior by all means.
+file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake)
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    # HACK: The FindHDF5.cmake script does not seem to detect the HDF5_DEFINITIONS correctly
-    #       if HDF5 has been built without the tools (which is the case in the HDF5 port),
-    #       so we set the BUILT_AS_DYNAMIC_LIB=1 flag here explicitly because we know HDF5
-    #       has been build as dynamic library in the current case.
-    list(APPEND ADDITIONAL_OPTIONS "-DHDF5_DEFINITIONS=-DH5_BUILT_AS_DYNAMIC_LIB=1")
+    list(APPEND ADDITIONAL_OPTIONS "-DVTK_EXTERNAL_HDF5_IS_SHARED=ON")
 endif()

 vcpkg_configure_cmake(
@ -41,17 +54,21 @@ vcpkg_configure_cmake(
        -DVTK_USE_SYSTEM_EXPAT=ON
        -DVTK_USE_SYSTEM_FREETYPE=ON
        # -DVTK_USE_SYSTEM_GL2PS=ON
+        # -DVTK_USE_SYSTEM_LIBHARU=ON
+        -DVTK_USE_SYSTEM_JPEG=ON
        -DVTK_USE_SYSTEM_GLEW=ON
        -DVTK_USE_SYSTEM_HDF5=ON
        -DVTK_USE_SYSTEM_JSONCPP=ON
-        # -DVTK_USE_SYSTEM_LIBPROJ4=ON
-        # -DVTK_USE_SYSTEM_LIBRARIES=ON
+        -DVTK_USE_SYSTEM_LIBPROJ4=ON
        -DVTK_USE_SYSTEM_LIBXML2=ON
+        -DVTK_USE_SYSTEM_LZ4=ON
        # -DVTK_USE_SYSTEM_NETCDF=ON
-        # -DVTK_USE_SYSTEM_OGGTHEORA=ON
+        # -DVTK_USE_SYSTEM_NETCDFCPP=ON
+        -DVTK_USE_SYSTEM_OGGTHEORA=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
@ -68,24 +85,109 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()

-file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_MODULE)
-string(REPLACE "list\(APPEND _IMPORT_CHECK_FILES_FOR_vtkEncodeString" "#list(APPEND _IMPORT_CHECK_FILES_FOR_vtkEncodeString" VTK_TARGETS_RELEASE_MODULE "${VTK_TARGETS_RELEASE_MODULE}")
-string(REPLACE "list\(APPEND _IMPORT_CHECK_FILES_FOR_vtkHashSource" "#list(APPEND _IMPORT_CHECK_FILES_FOR_vtkHashSource" VTK_TARGETS_RELEASE_MODULE "${VTK_TARGETS_RELEASE_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_MODULE}")
+vcpkg_fixup_cmake_targets()

-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" VTK_TARGETS_DEBUG_MODULE "${VTK_TARGETS_DEBUG_MODULE}")
-string(REPLACE "list\(APPEND _IMPORT_CHECK_FILES_FOR_vtkEncodeString" "#list(APPEND _IMPORT_CHECK_FILES_FOR_vtkEncodeString" VTK_TARGETS_DEBUG_MODULE "${VTK_TARGETS_DEBUG_MODULE}")
-string(REPLACE "list\(APPEND _IMPORT_CHECK_FILES_FOR_vtkHashSource" "#list(APPEND _IMPORT_CHECK_FILES_FOR_vtkHashSource" VTK_TARGETS_DEBUG_MODULE "${VTK_TARGETS_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_MODULE}")
+# For VTK vcpkg_fixup_cmake_targets is not enough:
+# Files for system third party dependencies are written to modules that
+# are located in the paths `share/vtk/Modules` and `debug/share/vtk/Modules`.
+# In the release folder, only the release libraries are referenced (e.g. "C:/vcpkg/installed/x64-windows/lib/zlib.lib").
+# But in the debug folder both libraries (e.g. "optimized;C:/vcpkg/installed/x64-windows/lib/zlib.lib;debug;C:/vcpkg/installed/x64-windows/debug/lib/zlibd.lib")
+# or only the debug library (e.g. "C:/vcpkg/installed/x64-windows/debug/lib/hdf5_D.lib") is referenced.
+# This is because VCPKG appends only the release library prefix (.../x64-windows/lib)
+# when configuring release but both (.../x64-windows/lib and .../x64-windows/debug/lib)
+# when configuring debug.
+# Now if we delete the debug/share/Modules folder and just leave share/Modules, a library
+# that links to VTK will always use the release third party dependencies, even if
+# debug VTK is used.
+# 
+# The following code merges the libraries from both release and debug:
+
+include(${CMAKE_CURRENT_LIST_DIR}/SplitLibraryConfigurations.cmake)
+
+function(_vtk_combine_third_party_libraries MODULE_NAME)
+    set(MODULE_LIBRARIES_REGEX "set\\(${MODULE_NAME}_LIBRARIES \"([^\"]*)\"\\)")
+
+    # Read release libraries
+    file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/${MODULE_NAME}.cmake" RELEASE_MODULE_CONTENT)
+    if("${RELEASE_MODULE_CONTENT}" MATCHES "${MODULE_LIBRARIES_REGEX}")
+        set(RELEASE_LIBRARY_LIST "${CMAKE_MATCH_1}")
+    else()
+        message(FATAL_ERROR "Could not extract module libraries for ${MODULE_NAME}")
+    endif()
+
+    # Read debug libraries
+    file(READ "${CURRENT_PACKAGES_DIR}/debug/share/vtk/Modules/${MODULE_NAME}.cmake" DEBUG_MODULE_CONTENT)
+    if("${DEBUG_MODULE_CONTENT}" MATCHES "${MODULE_LIBRARIES_REGEX}")
+        set(DEBUG_LIBRARY_LIST "${CMAKE_MATCH_1}")
+    else()
+        message(FATAL_ERROR "Could not extract module libraries for ${MODULE_NAME}")
+    endif()
+    
+    split_library_configurations("${RELEASE_LIBRARY_LIST}" OPTIMIZED_RELEASE_LIBRARIES DEBUG_RELEASE_LIBRARIES GENERAL_RELEASE_LIBRARIES)
+    split_library_configurations("${DEBUG_LIBRARY_LIST}" OPTIMIZED_DEBUG_LIBRARIES DEBUG_DEBUG_LIBRARIES GENERAL_DEBUG_LIBRARIES)
+
+    # Combine libraries and wrap them in generator expressions
+    foreach(LIBRARY ${OPTIMIZED_RELEASE_LIBRARIES} ${GENERAL_RELEASE_LIBRARIES})
+        list(APPEND LIBRARY_LIST "$<$<NOT:$<CONFIG:Debug>>:${LIBRARY}>")
+    endforeach()
+    foreach(LIBRARY ${DEBUG_DEBUG_LIBRARIES} ${GENERAL_DEBUG_LIBRARIES})
+        list(APPEND LIBRARY_LIST "$<$<CONFIG:Debug>:${LIBRARY}>")
+    endforeach()
+
+    # Write combined libraries back
+    string(REGEX REPLACE "${MODULE_LIBRARIES_REGEX}"
+        "set(${MODULE_NAME}_LIBRARIES \"${LIBRARY_LIST}\")"
+        RELEASE_MODULE_CONTENT
+        "${RELEASE_MODULE_CONTENT}"
+    )
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/${MODULE_NAME}.cmake" "${RELEASE_MODULE_CONTENT}")
+endfunction()
+
+# IMPORTANT: Please make sure to extend this list whenever a new library is marked `USE_SYSTEM` in the configure step above!
+set(SYSTEM_THIRD_PARTY_MODULES
+    vtkexpat
+    vtkfreetype
+    vtkjpeg
+    vtkglew
+    vtkhdf5
+    vtkjsoncpp
+    vtklibproj4
+    vtklibxml2
+    vtklz4
+    vtkoggtheora
+    vtkpng
+    vtktiff
+    vtkzlib
+)
+
+foreach(MODULE IN LISTS SYSTEM_THIRD_PARTY_MODULES)
+    _vtk_combine_third_party_libraries("${MODULE}")
+endforeach()
+
+# Remove all explicit references to vcpkg system libraries in the general VTKTargets.cmake file
+# since these references always point to the release libraries, even in the debug case.
+# The dependencies should be handled by the explicit modules we fixed above, so removing
+# them here shouldn't cause any problems.
+file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTENT)
+string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}/lib/[^\\.]*\\.lib" "" VTK_TARGETS_CONTENT "${VTK_TARGETS_CONTENT}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}")
+
+# Move executable to tools directory
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vtkEncodeString-8.0.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/vtkEncodeString-8.0.exe)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vtkHashSource-8.0.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/vtkHashSource-8.0.exe)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkEncodeString-8.0.exe)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkHashSource-8.0.exe)
+else()
+    # On static builds there should be no bin directory at all
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/vtkEncodeString-7.1.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/vtkHashSource-7.1.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkEncodeString-7.1.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkHashSource-7.1.exe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 # Handle copyright
 file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk)
--- a/Show More
+++ b/Show More