Merge branch 'master' of https://github.com/Microsoft/vcpkg into pr/cmake_3_14

docs/users/config-environment.md

@@ -40,3 +40,10 @@ This environment variable can be set to a triplet name which will be used for un
 #### VCPKG_FORCE_SYSTEM_BINARIES
 
 This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries.
+
+### VCPKG_KEEP_ENV_VARS
+
+This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to
+the build environment.
+
+Example: `FOO_SDK_DIR;BAR_SDK_DIR`

ports/abseil/CONTROL

@@ -1,5 +1,5 @@
 Source: abseil
-Version: 2019-01-30
+Version: 2019_01_30-1
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.

ports/abseil/fix-usage-lnk-error.patch

@@ -0,0 +1,232 @@
+diff --git a/absl/strings/ascii.cc b/absl/strings/ascii.cc
+index c9481e8..5c155e1 100644
+--- a/absl/strings/ascii.cc
++++ b/absl/strings/ascii.cc
+@@ -49,109 +49,6 @@ namespace ascii_internal {
+ //     print ' //', Hex2(i & 0x78)
+ //   elif i % 16 == 15:
+ //     print
+-
+-// clang-format off
+-// Array of bitfields holding character information. Each bit value corresponds
+-// to a particular character feature. For readability, and because the value
+-// of these bits is tightly coupled to this implementation, the individual bits
+-// are not named. Note that bitfields for all characters above ASCII 127 are
+-// zero-initialized.
+-const unsigned char kPropertyBits[256] = {
+-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x00
+-    0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
+-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x10
+-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+-    0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  // 0x20
+-    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+-    0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,  // 0x30
+-    0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+-    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x40
+-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x50
+-    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
+-    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x60
+-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+-    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x70
+-    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
+-};
+-
+-// Array of characters for the ascii_tolower() function. For values 'A'
+-// through 'Z', return the lower-case character; otherwise, return the
+-// identity of the passed character.
+-const char kToLower[256] = {
+-  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+-  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+-  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+-  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+-  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+-  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+-  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+-  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+-  '\x40',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
+-     'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
+-     'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
+-     'x',    'y',    'z', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+-  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+-  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+-  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+-  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+-  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+-  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+-  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+-  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+-  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+-  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+-  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+-  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+-  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+-  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
+-  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
+-  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
+-  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+-  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+-  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+-  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
+-};
+-
+-// Array of characters for the ascii_toupper() function. For values 'a'
+-// through 'z', return the upper-case character; otherwise, return the
+-// identity of the passed character.
+-const char kToUpper[256] = {
+-  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+-  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+-  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+-  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+-  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+-  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+-  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+-  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+-  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+-  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+-  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+-  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+-  '\x60',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
+-     'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
+-     'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
+-     'X',    'Y',    'Z', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+-  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+-  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+-  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+-  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+-  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+-  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+-  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+-  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+-  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+-  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
+-  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
+-  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
+-  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+-  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+-  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+-  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
+-};
+-// clang-format on
+-
+ }  // namespace ascii_internal
+ 
+ void AsciiStrToLower(std::string* s) {
+diff --git a/absl/strings/ascii.h b/absl/strings/ascii.h
+index 48a9da2..9d70382 100644
+--- a/absl/strings/ascii.h
++++ b/absl/strings/ascii.h
+@@ -61,14 +61,105 @@
+ namespace absl {
+ namespace ascii_internal {
+ 
+-// Declaration for an array of bitfields holding character information.
+-extern const unsigned char kPropertyBits[256];
+-
+-// Declaration for the array of characters to upper-case characters.
+-extern const char kToUpper[256];
+-
+-// Declaration for the array of characters to lower-case characters.
+-extern const char kToLower[256];
++// Array of bitfields holding character information. Each bit value corresponds
++// to a particular character feature. For readability, and because the value
++// of these bits is tightly coupled to this implementation, the individual bits
++// are not named. Note that bitfields for all characters above ASCII 127 are
++// zero-initialized.
++const unsigned char kPropertyBits[256] = {
++    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x00
++    0x40, 0x68, 0x48, 0x48, 0x48, 0x48, 0x40, 0x40,
++    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x10
++    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
++    0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  // 0x20
++    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
++    0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,  // 0x30
++    0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
++    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x40
++    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
++    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x50
++    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x10,
++    0x10, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x05,  // 0x60
++    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
++    0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,  // 0x70
++    0x05, 0x05, 0x05, 0x10, 0x10, 0x10, 0x10, 0x40,
++};
++
++// Array of characters for the ascii_tolower() function. For values 'A'
++// through 'Z', return the lower-case character; otherwise, return the
++// identity of the passed character.
++const char kToLower[256] = {
++  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
++  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
++  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
++  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
++  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
++  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
++  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
++  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
++  '\x40',    'a',    'b',    'c',    'd',    'e',    'f',    'g',
++     'h',    'i',    'j',    'k',    'l',    'm',    'n',    'o',
++     'p',    'q',    'r',    's',    't',    'u',    'v',    'w',
++     'x',    'y',    'z', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
++  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
++  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
++  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
++  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
++  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
++  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
++  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
++  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
++  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
++  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
++  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
++  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
++  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
++  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
++  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
++  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
++  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
++  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
++  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
++  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
++};
++
++// Array of characters for the ascii_toupper() function. For values 'a'
++// through 'z', return the upper-case character; otherwise, return the
++// identity of the passed character.
++const char kToUpper[256] = {
++  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
++  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
++  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
++  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
++  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
++  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
++  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
++  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
++  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
++  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
++  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
++  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
++  '\x60',    'A',    'B',    'C',    'D',    'E',    'F',    'G',
++     'H',    'I',    'J',    'K',    'L',    'M',    'N',    'O',
++     'P',    'Q',    'R',    'S',    'T',    'U',    'V',    'W',
++     'X',    'Y',    'Z', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
++  '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
++  '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
++  '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
++  '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
++  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
++  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
++  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
++  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
++  '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
++  '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
++  '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
++  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
++  '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
++  '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
++  '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
++  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff',
++};
+ 
+ }  // namespace ascii_internal
+ 

ports/abseil/portfile.cmake

@@ -7,9 +7,10 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF 540e2537b92cd4abfae6ceddfe24304345461f32
+    REF 540e2537b92cd4abfae6ceddfe24304345461f32
     SHA512 3cabab23ad159592562a30531052bb18c66fce75f93f84a6de17a7488b7d6651f645950c1adb8dfbacc651f2bc0db82c316de132baab38e3ef95ea5b5a0eb6d2
     HEAD_REF master
+    PATCHES fix-usage-lnk-error.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -23,14 +24,6 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-abseil TARGET_PATH share/unofficial-abseil)
 
-file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/*)
-foreach(FILE ${HEADERS})
-    file(READ "${FILE}" _contents)
-    string(REPLACE "std::min(" "(std::min)(" _contents "${_contents}")
-    string(REPLACE "std::max(" "(std::max)(" _contents "${_contents}")
-    file(WRITE "${FILE}" "${_contents}")
-endforeach()
-
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/abseil RENAME copyright)

ports/ace/CONTROL

@@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.4-2
+Version: 6.5.4-3
 Description: The ADAPTIVE Communication Environment

ports/ace/portfile.cmake

@@ -3,8 +3,10 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(MPC_STATIC_FLAG -static)
+  if(NOT VCPKG_CMAKE_SYSTEM_NAME)
     set(DLL_DECORATOR s)
+  endif()
+  set(MPC_STATIC_FLAG -static)
 endif()
 include(vcpkg_common_functions)
 set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
@@ -29,27 +31,54 @@ else ()
     set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
 endif()
 
-if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-    set(SOLUTION_TYPE vs2017)
-else()
-    set(SOLUTION_TYPE vc14)
-endif()
-
 # Add ace/config.h file
 # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
-file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+  set(LIB_RELEASE_SUFFIX .lib)
+  set(LIB_DEBUG_SUFFIX d.lib)
+  if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    set(SOLUTION_TYPE vs2017)
+  else()
+    set(SOLUTION_TYPE vc14)
+  endif()
+  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(DLL_DECORATOR)
+  set(LIB_RELEASE_SUFFIX .a)
+  set(LIB_DEBUG_SUFFIX .a)
+  set(LIB_PREFIX lib)
+  set(SOLUTION_TYPE gnuace)
+  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
+  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)include/makeinclude/platform_linux.GNU")
+endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_required_process(
     COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG}
     WORKING_DIRECTORY ${ACE_ROOT}
-    LOGNAME mwc
+    LOGNAME mwc-${TARGET_TRIPLET}
 )
 
-vcpkg_build_msbuild(
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+  vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
-)
+  )
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  FIND_PROGRAM(MAKE make)
+  IF (NOT MAKE)
+    MESSAGE(FATAL_ERROR "MAKE not found")
+  ENDIF ()
+  vcpkg_execute_required_process(
+    COMMAND make
+    WORKING_DIRECTORY ${ACE_ROOT}/ace
+    LOGNAME make-${TARGET_TRIPLET}
+  )
+endif()
 
 # ACE itself does not define an install target, so it is not clear which
 # headers are public and which not. For the moment we install everything
@@ -93,12 +122,12 @@ function(install_ace_library SOURCE_PATH ACE_LIBRARY)
 
     # Install the lib files
     file(INSTALL
-        ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}d.lib
+        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
         DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
     )
 
     file(INSTALL
-        ${LIB_PATH}/${ACE_LIBRARY}${DLL_DECORATOR}.lib
+        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
         DESTINATION ${CURRENT_PACKAGES_DIR}/lib
     )
 endfunction()
@@ -108,11 +137,13 @@ install_ace_library(${ACE_ROOT} "ACE_Compression")
 install_ace_library(${ACE_ROOT} "ACE_ETCL")
 install_ace_library(${ACE_ROOT} "ACE_ETCL_Parser")
 install_ace_library(${ACE_ROOT} "ACE_Monitor_Control")
-install_ace_library(${ACE_ROOT} "ACE_QoS")
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+  install_ace_library(${ACE_ROOT} "ACE_QoS")
+endif()
 install_ace_library(${ACE_ROOT} "ACE_RLECompression")
 
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
 
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()

ports/alembic/portfile.cmake

@@ -1,5 +1,12 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Alembic's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     message(STATUS "Alembic does not support static linkage. Building dynamically.")
     set(VCPKG_LIBRARY_LINKAGE dynamic)

ports/ampl-mp/CONTROL

@@ -1,3 +1,3 @@
 Source: ampl-mp
-Version: 2019-02-08
+Version: 2019-03-21
 Description: An open-source library for mathematical programming

ports/ampl-mp/portfile.cmake

@@ -2,11 +2,15 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+	message(FATAL_ERROR "Cross-compiling is not supported")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ampl/mp
-    REF d305155b047b69fc5c6e5fda8630c753d7973b9a
-    SHA512 2c8ffd6de946a6f8ea94a8e0c00f03f67753ad99534e0d5fcaaaeb472fe76a3383324bcb628a31d8c01bc5f60254790f5508c8394096a4f05672f814dbd6fe2e
+    REF 67875b71ef68511277ec2dc8224f613487cefce9
+    SHA512 fad2496c10b843ddad7c4dba1eea1b4cd22e90be12dec2ad598fbd1ed5e1c492d92c5130490c7045ea608bc9ea2af191661c39b3bee3bc5159663f306ce50950
     HEAD_REF master
     PATCHES
     disable-matlab-mex.patch

ports/ampl-mp/workaround-msvc-optimizer-ice.patch

@@ -1,14 +1,28 @@
---- a/src/asl/CMakeLists.txt	2019-02-07 22:45:15.191909400 -0600
-+++ b/src/asl/CMakeLists.txt	2019-02-07 22:47:10.364936600 -0600
-@@ -216,6 +216,11 @@ add_mp_library(asl-core OBJECT ${ASL_COR
-   COMPILE_DEFINITIONS ${ASL_COMPILE_DEFINITIONS}
-   INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
+diff --git a/src/asl/solvers/avltree.c b/src/asl/solvers/avltree.c
+index 7a9adaba..4dd97054 100644
+--- a/src/asl/solvers/avltree.c
++++ b/src/asl/solvers/avltree.c
+@@ -54,6 +54,9 @@ AVL_Tree {
+ 	void (*Free)(void*);
+ 	};
  
-+if (MSVC)
-+  set_source_files_properties(solvers/avltree.c solvers/sphes.c
-+    PROPERTIES COMPILE_OPTIONS /Od)
-+endif ()
-+
- # Public ASL headers.
- set(ASL_HEADERS aslbuilder.h aslexpr.h aslexpr-visitor.h
-   aslproblem.h aslinterface.h ${CMAKE_CURRENT_BINARY_DIR}/stdio1.h)
++#if defined(_MSC_VER) && _MSC_VER < 1917
++#pragma optimize("", off)
++#endif
+  AVL_Tree*
+ AVL_Tree_alloc2(void *v, AVL_Elcomp cmp, void *(*Malloc)(size_t), void (*Free)(void*))
+ {
+diff --git a/src/asl/solvers/sphes.c b/src/asl/solvers/sphes.c
+index 326d997f..ae8952ed 100644
+--- a/src/asl/solvers/sphes.c
++++ b/src/asl/solvers/sphes.c
+@@ -452,6 +452,9 @@ compar(const void *a, const void *b)
+ #undef del_mblk
+ #define del_mblk(b,c) Del_mblk_ASL(a,b,(Char*)(c))
+ 
++#if defined(_MSC_VER) && _MSC_VER < 1917
++#pragma optimize("", off)
++#endif
+  static void
+ new_Hesoprod(ASL_pfgh *asl, ograd *L, ograd *R, real coef)
+ {

ports/angle/CMakeLists.txt

@@ -19,9 +19,11 @@ else()
 endif()
 
 if(WINDOWS_ANY)
-    add_compile_options(/d2guard4 /Wv:18 /guard:cf)
+    add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive)
 else()
-    add_compile_options(-std=c++17 -fPIC)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
 if (APPLE)

ports/angle/CONTROL

@@ -1,5 +1,5 @@
 Source: angle
-Version: 2019-03-13-c2ee2cc
+Version: 2019-03-13-c2ee2cc-1
 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
   The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
 Build-Depends: egl-registry

ports/apr-util/CONTROL

@@ -1,4 +1,4 @@
 Source: apr-util
-Version: 1.6.0-1
+Version: 1.6.0-2
 Description: Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
 Build-Depends: expat, apr, openssl

ports/apr-util/portfile.cmake

@@ -13,16 +13,24 @@ vcpkg_apply_patches(
   PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-expat.patch"
 )
 
-
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_configure_cmake(
+      SOURCE_PATH ${SOURCE_PATH}
+      PREFER_NINJA
+      OPTIONS -DAPU_DECLARE_EXPORT=ON
+      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+    )
+else()
+    vcpkg_configure_cmake(
+      SOURCE_PATH ${SOURCE_PATH}
+      PREFER_NINJA
+      OPTIONS -DAPU_DECLARE_STATIC=ON
+      OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+    )
+endif()
 
 vcpkg_install_cmake()
 
-
 file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h  APU_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
   string(REPLACE "defined(APU_DECLARE_EXPORT)" "1" APU_H "${APU_H}")

ports/avro-c/portfile.cmake

@@ -1,5 +1,12 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Avro-c's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO apache/avro

ports/aws-sdk-cpp/portfile.cmake

@@ -1,5 +1,12 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Aws-sdk-cpp's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp

ports/azure-c-shared-utility/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 1.1.11-5
+Version: 2019-03-18
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux)
 

ports/azure-c-shared-utility/portfile.cmake

@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 773980d7882e4d5f1e7c9be2a0797d61fbc19da1
-        SHA512 fa374db336f5d186bcfd6ba70660167fdc87a1847376579cee894af3d2810aba097b3468e75c0b4213b68423cc07215032eeae6ee07590378237606112286ac4
+        REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866
+        SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 6229ecb0d49b7e75fdb88d2c477e94e5b5394c43
-        SHA512 b0426702dd7a79e149dd4f6c2b8d0b43cd06a82ce014112dcaba1de4e669157fe08a5f3748d431a9e2f559e066f658c1a62f5ac08d2da0bd1f5cf04dca2e52c2
+        REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866
+        SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
@@ -43,3 +43,4 @@ file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRE
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+

ports/azure-iot-sdk-c/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 1.2.14-1
+Version: 2019-03-18
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 

ports/azure-iot-sdk-c/portfile.cmake

@@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 6633c5b18710febf1af7713cf1a336fd38f623ed
-        SHA512 17787aa4ef52d4cf39f939fee05555fcef85cde63620036f6715b699902fd3fd766250c26ea6065f5f36572ac2b9d5293e79ba17ea9d8f4cbce267322269e7e4
+        REF 68d9964daa3e6754f6f8d98bbbd637b0967d4d29
+        SHA512 5492ab06ae3686c7a167d63620d6ca00024dd52d46627d7958569f1ec0cfca1b56151d54b8c7975f127f655018c10e830747ef84a0cdc66a44e903e25b2dc985
         HEAD_REF public-preview
         PATCHES improve-external-deps.patch
     )
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF a46d038a9151ff1fc7d9b70f2d7fcca03c19b972
-        SHA512 bcd9c656ab721ab15da3cb690772c84e58e09d8785b975b046d4986b5fa16fb9e74a06af00acbe91fd8d4b897cd12dba9b2318ea5465865bff98f5429d2ee618
+        REF 8c331e8552f754bb6e0502486ceee698625eb468
+        SHA512 cc6f34e04f237bb5e8e5445e033eefab00373d53a4847ab6089c9b8eb400ab87ced6905f1c78ea7d0da3e9a56145e86a58d2f226fcf38f08659330a33d68f82e
         HEAD_REF master
         PATCHES improve-external-deps.patch
     )
@@ -44,3 +44,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+

ports/azure-uamqp-c/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 1.2.11-4
+Version: 2019-03-18
 Build-Depends: azure-c-shared-utility
 Description: AMQP library for C
 

ports/azure-uamqp-c/portfile.cmake

@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 195f2480f31e0a9492e3ff3a7a1eed4a69205ddd
-        SHA512 fa2cab67d119018b7e28dd002641bc3e87ac2d45ecddeddb867135bac6e5eda02588f84c26283947bdc47789c90a3f9e04dab16e5eb9be8a384ef5c9bcf39572
+        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
+        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 32f53b92ab864ea9e54e7ae262dc72bdabfcfa01
-        SHA512 3a96feb3d04a2e90b59e897b6da93410de330963c75a0cb875d53b91838c977f6a801f4812b67c4e519059fd04aed9baf43f72258652832cf49b12692a47d188
+        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
+        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
         HEAD_REF master
     )
 endif()
@@ -40,3 +40,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uamqp-c/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+

ports/azure-uhttp-c/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 1.1.11-4
+Version: 2019-03-18
 Build-Depends: azure-c-shared-utility
 Description: Azure HTTP Library written in C
 

ports/azure-uhttp-c/portfile.cmake

@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 3a81e598caf2bd37077b7cd20bb45aaa9e694df7
-        SHA512 6f12efdd2f02adb2414e10daa0604f5351f7731b997d69a9ca2923b6246c7a628bd859c6dca2503e51eeece851421b7739ffbf31a3f3d34dca4dcbadb54411d2
+        REF 43dce924b32818f8ab851f972cffebc204edc5c4
+        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 2e838f1587d7493f3bb0470b7e21b39c3f7c84ab
-        SHA512 30114e995bfdfa73dc43d016588290ef886e3c24d586f443d7f82d9c577f7274b5fc4b2ca40c9dd39883262cab30bf5b3e3eb560c27191ec4e9bb893e468bb54
+        REF 43dce924b32818f8ab851f972cffebc204edc5c4
+        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
         HEAD_REF master
     )
 endif()
@@ -41,3 +41,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uhttp-c/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+

ports/azure-umqtt-c/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 1.1.11-4
+Version: 2019-03-18
 Build-Depends: azure-c-shared-utility
 Description: General purpose library for communication over the mqtt protocol
 

ports/azure-umqtt-c/portfile.cmake

@@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF f68e8d535d18028e3e6ed4d806ce8994037a49fa
-        SHA512 9bea4c3dbd26f5221c4da782954a4e8b4d372aca75b71a9eb63b818f31f153e4be534a20960c007c3aa184766f2a826c5ba11e780e23098707419ab39f055cc1
+        REF ea9f6112d002bdff55c94df327bc7effc8393c78
+        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
         HEAD_REF master
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF 6bb14b0a731e5c896758fc2f6ffe3d4bd31d2187
-        SHA512 001b04f203327e5096ad3453268939da7738952704a4e0b88ea033b0a2566bec7502b3a674eadf476f9df0da605d25b8a7f6a306e23a42690884188326bd0743
+        REF ea9f6112d002bdff55c94df327bc7effc8393c78
+        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
         HEAD_REF master
     )
 endif()
@@ -40,3 +40,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-umqtt-c/copyright COPYONLY)
 
 vcpkg_copy_pdbs()
+

ports/boost-python/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_from_github(
     REF boost-1.69.0
     SHA512 7ca3210a35ac43eae31c58d7ccd58e6410ec0d62a25ae7a03fb2db9baa4cf863fbaad1686c6ceaf804663c5707f6e60b4806f792f0aceb5c12a85b705d4242d0
     HEAD_REF master
+    PATCHES unwind-type.patch
 )
 
 # Find Python. Can't use find_package here, but we already know where everything is

ports/brunocodutra-metal/CONTROL

@@ -0,0 +1,3 @@
+Source: brunocodutra-metal
+Version: v2.0.1-1
+Description: A single header C++11 library designed to make you love template metaprogramming

ports/brunocodutra-metal/portfile.cmake

@@ -0,0 +1,31 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brunocodutra/metal
+    REF v2.0.1
+    SHA512 6aca54e2f2a6d99466d247dbd57706caef33d2399989c2eb14e99d1419922eff753acb53248f8684c1ed11bb87d79b2e850637190e8949f69e0f5ee7304281dc
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/Metal
+    TARGET_PATH share/metal
+)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})

ports/caffe2/CONTROL

@@ -1,4 +1,4 @@
 Source: caffe2
-Version: 0.8.1-1
+Version: 0.8.1-2
 Build-Depends: lmdb, gflags, glog, eigen3, protobuf
 Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.

ports/caffe2/fix-space.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
+index e082298..25186e4 100644
+--- a/cmake/Utils.cmake
++++ b/cmake/Utils.cmake
+@@ -386,7 +386,7 @@ function(caffe_add_whole_archive_flag lib output_var)
+     set(${output_var} -Wl,-force_load,$<TARGET_FILE:${lib}> PARENT_SCOPE)
+   elseif(MSVC)
+     # In MSVC, we will add whole archive in default.
+-    set(${output_var} -WHOLEARCHIVE:$<TARGET_FILE:${lib}> PARENT_SCOPE)
++    set(${output_var} -WHOLEARCHIVE:"$<TARGET_FILE:${lib}>" PARENT_SCOPE)
+   else()
+     # Assume everything else is like gcc
+     set(${output_var} -Wl,--whole-archive ${lib} -Wl,--no-whole-archive PARENT_SCOPE)

ports/caffe2/portfile.cmake

@@ -16,7 +16,8 @@ vcpkg_from_github(
     SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023
     HEAD_REF master
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/msvc-fixes.patch
+        msvc-fixes.patch
+        fix-space.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)

ports/capnproto/0001-fix-capnpc-extension-handling-on-Windows.patch

@@ -0,0 +1,39 @@
+From 6e142f270524d78689a119737660050561cf853e Mon Sep 17 00:00:00 2001
+From: Thomas Arcila <thomas.arcila@gmail.com>
+Date: Sat, 9 Mar 2019 19:00:24 -0500
+Subject: [PATCH] fix capnpc extension handling on Windows
+
+---
+ c++/src/capnp/CMakeLists.txt     | 2 +-
+ c++/src/capnp/compiler/capnp.c++ | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/c++/src/capnp/CMakeLists.txt b/c++/src/capnp/CMakeLists.txt
+index 11cbf5af..20b99ed3 100644
+--- a/c++/src/capnp/CMakeLists.txt
++++ b/c++/src/capnp/CMakeLists.txt
+@@ -182,7 +182,7 @@ if(NOT CAPNP_LITE)
+   install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+   # Symlink capnpc -> capnp
+-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc\")")
++  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp${CMAKE_EXECUTABLE_SUFFIX} \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc${CMAKE_EXECUTABLE_SUFFIX}\")")
+ endif()  # NOT CAPNP_LITE
+ 
+ # Tests ========================================================================
+diff --git a/c++/src/capnp/compiler/capnp.c++ b/c++/src/capnp/compiler/capnp.c++
+index 8e8c459b..d252fb12 100644
+--- a/c++/src/capnp/compiler/capnp.c++
++++ b/c++/src/capnp/compiler/capnp.c++
+@@ -78,7 +78,7 @@ public:
+       : context(context), disk(kj::newDiskFilesystem()), loader(*this) {}
+ 
+   kj::MainFunc getMain() {
+-    if (context.getProgramName().endsWith("capnpc")) {
++    if (context.getProgramName().endsWith("capnpc") || context.getProgramName().endsWith("capnpc.exe")) {
+       kj::MainBuilder builder(context, VERSION_STRING,
+             "Compiles Cap'n Proto schema files and generates corresponding source code in one or "
+             "more languages.");
+-- 
+2.19.1
+

ports/capnproto/CONTROL

@@ -0,0 +1,4 @@
+Source: capnproto
+Version: 0.7.0
+Description: Data interchange format and capability-based RPC system https://capnproto.org/
+Build-Depends: zlib

ports/capnproto/portfile.cmake

@@ -0,0 +1,45 @@
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    message(FATAL_ERROR "Error: UWP build is not supported.")
+endif()
+
+if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
+    # Undefined VCPKG_CMAKE_SYSTEM_NAME means Windows
+    message(FATAL_ERROR "Error: CapnProto only build on Windows for now. See #5630 and #5635")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message("Building DLLs not supported. Building static instead.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO capnproto/capnproto
+    REF v0.7.0
+    SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
+    HEAD_REF master
+	PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-capnpc-extension-handling-on-Windows.patch"
+)
+
+vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CapnProto")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/capnproto")
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/capnproto)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/capnproto)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/capnproto/LICENSE ${CURRENT_PACKAGES_DIR}/share/capnproto/copyright)
+
+# Disabled for now, see #5630 and #5635
+# vcpkg_test_cmake(PACKAGE_NAME CapnProto)

ports/cgal/CONTROL

@@ -1,6 +1,6 @@
 Source: cgal
-Version: 4.13-3
-Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic
+Version: 4.14-1
+Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 
 Feature: qt

ports/cgal/portfile.cmake

@@ -1,10 +1,17 @@
 include(vcpkg_common_functions)
 
+string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+    message(WARNING "Cgal's buildsystem uses very long paths and may fail on your system.\n"
+        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
+    )
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGAL/cgal
-    REF releases/CGAL-4.13
-    SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf
+    REF releases/CGAL-4.14
+    SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382
     HEAD_REF master
 )
 
@@ -42,11 +49,6 @@ else()
     endforeach()
 endif()
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents)
-string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}")
-string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}")
-
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)")
 
 file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
@@ -60,3 +62,5 @@ file(
         ${SOURCE_PATH}/Installation/LICENSE.LGPL
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal
 )
+
+vcpkg_test_cmake(PACKAGE_NAME CGAL)

ports/cli/CONTROL

@@ -0,0 +1,4 @@
+Source: cli
+Version: 2019-03-21
+Description: A library for interactive command line interfaces in modern C++
+Build-Depends: boost-asio

ports/cli/portfile.cmake

@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO daniele77/cli
+    REF f74c6eea9616e0a62f5b3be4e1d07ad432232e90
+    SHA512 9a5e25175844a7e9eacb05056c2e56e21be82efed6991d9c0e7d33e3a76f83d815455ec6e79d045ec15453354a1c50b0f91feef2766ae323931b4d4eb6caf1cf
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli TARGET_PATH share/cli)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli RENAME copyright)

ports/coroutine/CONTROL

@@ -1,4 +1,4 @@
 Source: coroutine
-Version: 1.4.0-1
+Version: 1.4.1
 Build-Depends: ms-gsl
 Description: C++ coroutine helper/example library

ports/coroutine/portfile.cmake

@@ -1,23 +1,23 @@
 include(vcpkg_common_functions)
 
-# The tagged commit for release 1.4 was changed by the library's author.
-# The current commit for release 1.4 is 3f804ca0f9ec94e3c85e3c5cc00aecc577fb8aad
-# We use the commit's hash to avoid the tag changing again it in the future.
-set(VERSION_1_4_COMMIT 3f804ca0f9ec94e3c85e3c5cc00aecc577fb8aad)
+if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
+    message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead. If it is critical, create an issue at the repo: github.com/luncliff/coroutine")
+endif()
+
+# changed to 1.4.1
+set(VERSION_1_4_COMMIT 8399236a4adf1cb49ef51133fb887027e3d77141)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO            luncliff/coroutine
     REF             ${VERSION_1_4_COMMIT}
-    SHA512          a77d66a8d485a99278f15652d26f255653824c47bd3653233e89ddb6368bc3b45ab0a8049e504c5acc8cf051da582bf6b4d8461c8f7f57bf5a0b7dcaddc0afbb
+    SHA512          35adf0aa3a923b869e02d1e33987f6c9922f90918e84feaf5a41e46334b7555db75f55c6dd797f74112010ef5e682ee6f5fbf58be84af88a8f8f084f3d6dac05
     HEAD_REF        master
 )
 
-if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
-    message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead or contact maintainer")
-endif()
-
 # package: 'ms-gsl'
-message(STATUS "Using Guideline Support Library at ${CURRENT_INSTALLED_DIR}/include")
+set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include 
+    CACHE PATH "path to include C++ core guideline support library" FORCE)
+message(STATUS "Using ms-gsl at ${GSL_INCLUDE_DIR}")
 
 set(DLL_LINKAGE false)
 if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
@@ -29,8 +29,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        # package: 'ms-gsl'
-        -DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+        -DGSL_INCLUDE_DIR=${GSL_INCLUDE_DIR}
         -DTEST_DISABLED=True
         -DBUILD_SHARED_LIBS=${DLL_LINKAGE}
 )

ports/cppgraphqlgen/CONTROL

@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 2.0.2
+Version: 2.1.0
 Build-Depends: pegtl, rapidjson
 Description: C++ GraphQL schema service generator

ports/cppgraphqlgen/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cppgraphqlgen
-    REF v2.0.2
-    SHA512 259c8bc844b70e99332cd52caf48de3e5f0dfdf5bba6d986209a0e5a9f4491953901b365f43e8612f171bdcaef80b524d6b261b62fb8a429e529a5701a839ca1
+    REF v2.1.0
+    SHA512 6fdeade25fc5c4af18d0288b80044a94cc9dcba9eed1640ec2cce06741b874f027930761964ed72073a25e083c0cf2fb828b9cf9732099c8a4f185776b1e1b8a
     HEAD_REF master
 )
 

ports/cpprestsdk/CONTROL

@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.11
+Version: 2.10.12
 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.

ports/cpprestsdk/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.10.11
-    SHA512 ea2299e128f8a75e67bb29fb42ce249cf48166c60cc73ec40d3f6ec5ae7b283ac8a083d62a7221b35f1f7876d814263a96b2a376bb306b1b4605ef17de36a115
+    REF v2.10.12
+    SHA512 a0839c11f71271464632095c1b91bd555220d1c87c4e7637d8424a51739e5abcd91e9257d1171d06470427ba48defd2be12bb34f5352c9590219b9f54292e3a8
     HEAD_REF master
 )
 

ports/cpr/CONTROL

@@ -1,4 +1,4 @@
 Source: cpr
-Version: 1.3.0-3
+Version: 1.3.0-4
 Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.
 Build-Depends: curl[core]

ports/cpr/portfile.cmake

@@ -1,15 +1,14 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO whoshuu/cpr
     REF 1.3.0
     SHA512 fd08f8a592a5e1fb8dc93158a4850b81575983c08527fb415f65bd9284f93c804c8680d16c548744583cd26b9353a7d4838269cfc59ccb6003da8941f620c273
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/enable-install.patch
+    HEAD_REF master
+    PATCHES enable-install.patch
 )
 
 vcpkg_configure_cmake(
@@ -18,7 +17,6 @@ vcpkg_configure_cmake(
     OPTIONS 
         -DBUILD_CPR_TESTS=OFF
         -DUSE_SYSTEM_CURL=ON
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
     OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=ON
 )

ports/cutelyst2/CONTROL

@@ -1,4 +1,4 @@
 Source: cutelyst2
-Version: 2.5.2-1
+Version: 2.5.2-2
 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework
 Build-Depends: qt5-base

ports/cutelyst2/portfile.cmake

@@ -35,11 +35,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins/ActionREST.dll)
     file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cutelyst2-plugins ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2-plugins)
 endif()
 
-file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*)
-if(NOT BINS)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright

ports/darknet/CONTROL

@@ -1,5 +1,5 @@
 Source: darknet
-Version: 1.0.0
+Version: 1.0.0-1
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
 Default-Features: weights

ports/darknet/dont_use_integrated_stb_lib.patch

@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5385ae..41514af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,7 +75,10 @@ if(USE_INTEGRATED_LIBS)
-   include_directories(${CMAKE_CURRENT_LIST_DIR}/3rdparty/include)
-   set(PThreads_windows_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/include)
-   set(PThreads_windows_LIBRARY ${CMAKE_CURRENT_LIST_DIR}/3rdparty/lib/x64/pthreadVC2.lib)
-+  set(STB_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR}/3rdparty/include)
-   add_definitions(-D_TIMESPEC_DEFINED)
-+else()
-+  find_path(STB_INCLUDE_PATH NAMES stb.h "The directory where stb.h resides")
- endif()
- 
- set(CMAKE_DEBUG_POSTFIX d)
-@@ -240,7 +243,7 @@ if(OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRACK)
-   add_executable(uselib_track ${CMAKE_CURRENT_LIST_DIR}/src/yolo_console_dll.cpp)
-   target_compile_definitions(uselib_track PRIVATE TRACK_OPTFLOW=1)
-   set_target_properties(uselib_track PROPERTIES LINKER_LANGUAGE CXX)
--  target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include>)
-+  target_include_directories(uselib_track PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${STB_INCLUDE_PATH}>)
-   target_link_libraries(uselib_track PRIVATE ${OpenCV_LIBS})
- endif()
- 
-@@ -251,9 +254,9 @@ add_executable(darknet ${CMAKE_CURRENT_LIST_DIR}/src/darknet.c ${sources} ${head
- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/src/darknet.c PROPERTIES LANGUAGE CXX)
- set_target_properties(darknet PROPERTIES LINKER_LANGUAGE CXX)
- 
--target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include>)
--target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include>)
--target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include>)
-+target_include_directories(darknet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${STB_INCLUDE_PATH}>)
-+target_include_directories(darklib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${STB_INCLUDE_PATH}>)
-+target_include_directories(uselib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src> $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${STB_INCLUDE_PATH}>)
- 
- if(CUDNN_FOUND)
-   target_link_libraries(darknet PRIVATE CuDNN::CuDNN)

ports/darknet/enable_standard_installation.patch

@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26c0ad7..9f425ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,8 +25,7 @@ enable_language(CXX)
- set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
- 
--set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix" FORCE)
--set(INSTALL_BIN_DIR      "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Path where exe and dll will be installed" FORCE)
-+set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed")
- set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
- set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
- set(INSTALL_CMAKE_DIR    "share/darknet"             CACHE PATH "Path where cmake configs will be installed")

ports/darknet/fix_cmakelists.patch

@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6a5076a..52d19a3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,8 +25,7 @@ enable_language(CXX)
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
+ 
+-set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix" FORCE)
+-set(INSTALL_BIN_DIR      "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Path where exe and dll will be installed" FORCE)
++set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed" FORCE)
+ set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
+ set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
+ set(INSTALL_CMAKE_DIR    "share/darknet"             CACHE PATH "Path where cmake configs will be installed")
+@@ -76,7 +75,6 @@ if(USE_INTEGRATED_LIBS)
+   set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located")
+   add_definitions(-D_TIMESPEC_DEFINED)
+ endif()
+-set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb CACHE PATH "Path where Stb image library can be located")
+ 
+ set(CMAKE_DEBUG_POSTFIX d)
+ add_definitions(-DUSE_CMAKE_LIBS)
+@@ -323,21 +321,19 @@ endif()
+ 
+ set_target_properties(darklib PROPERTIES PUBLIC_HEADER "${exported_headers};${CMAKE_CURRENT_LIST_DIR}/include/yolo_v2_class.hpp")
+ 
+-install(TARGETS darklib uselib darknet EXPORT DarknetTargets
++install(TARGETS darklib EXPORT DarknetTargets
+   RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+   ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+   PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+   COMPONENT dev
+ )
++install(TARGETS uselib darknet
++  DESTINATION "${INSTALL_BIN_DIR}"
++)
+ if(OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRACK)
+   install(TARGETS uselib_track
+-    EXPORT DarknetTargets
+-    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+-    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+-    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+-    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
+-    COMPONENT dev
++    DESTINATION "${INSTALL_BIN_DIR}"
+   )
+ endif()
+ 

ports/darknet/portfile.cmake

@@ -11,12 +11,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO AlexeyAB/darknet
-  REF dd27d67f58f563bb6bb2af7bb6374f8a59cebcde
-  SHA512 6821ba9cd5dc185759492deaa2d20ac1ce60778a8aec9c372c96887d9650f9a97a3b7a3a5860b70078f483e62224772ef1078ecb9c03b1b3bed230569cc7b919
+  REF 1cd332e4cac001ffcc12a24c72640fe02b69a8a0
+  SHA512 313018d51747b40244d3a828dce8deb35f900a6be1198f0f1af5647f3889ead7f1ac78cdc4223cfe85d279ca21000df1c8feac02e703e5b91af939e26e4d5571
   HEAD_REF master
   PATCHES
-    enable_standard_installation.patch
-    dont_use_integrated_stb_lib.patch
+    fix_cmakelists.patch
 )
 
 set(ENABLE_CUDA OFF)
@@ -52,8 +51,8 @@ if("weights" IN_LIST FEATURES)
   )
 endif()
 
-file(REMOVE ${SOURCE_PATH}/src/stb_image.h)
-file(REMOVE ${SOURCE_PATH}/src/stb_image_write.h)
+#make sure we don't use any integrated pre-built library
+file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty)
 
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
@@ -92,8 +91,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-#use vcpkg_fixup_cmake_targets()?
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/darknet/DarknetTargets.cmake ${CURRENT_PACKAGES_DIR}/share/darknet/DarknetTargets.cmake)
+vcpkg_fixup_cmake_targets()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

ports/decimal-for-cpp/CONTROL

@@ -1,4 +1,4 @@
 Source: decimal-for-cpp
-Version:1.12
+Version:1.16
 Description: Decimal data type support, for COBOL-like fixed-point operations on currency values. 
 

ports/decimal-for-cpp/portfile.cmake

@@ -1,29 +1,16 @@
-# 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}
-#
-
 #header-only library
 
 include(vcpkg_common_functions)
 
-vcpkg_download_distfile(HEADER
-    URLS "https://raw.githubusercontent.com/vpiotr/decimal_for_cpp/98287a0f0f48aaed2cc146d7682396ae08ed0aea/include/decimal.h"
-    FILENAME "decimal.h"
-    SHA512 9de1208760c74ff1e6b1a74957dabae33981d2f5d0ec402b48f27f4dc24c950ea69219a9ee9831959a8669a9c7908093d833a227924f1955cbe444a9f43c5f3a
-)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+	REPO vpiotr/decimal_for_cpp
+	REF 375633343aa0af812a3ebf4bd06adaeff112ead4
+	SHA512 7692fbb1643ed77b0b44fee1cf9a603fa257a5cf64ea66193c571fca61d138c6465a359db21955a4e2a234677f1806d47e05811daf2954004b108e09d3c8d4fa
+	HEAD_REF master
+	)
 
-vcpkg_download_distfile(LICENSE
-    URLS "https://raw.githubusercontent.com/vpiotr/decimal_for_cpp/98287a0f0f48aaed2cc146d7682396ae08ed0aea/doc/license.txt"
-    FILENAME "decimal-for-cpp-License.txt"
-    SHA512 0b2be46b07a0536404887fae9665d6532ffd4cbfefbec42926c14e055f538c1f3a73b6e61ab7fa1584e634ad99304133d18855197df0a914cbb835674cc67677
-)
-
-
-file(COPY ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/decimal-for-cpp-License.txt ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/copyright)
+file(COPY ${SOURCE_PATH}/include/decimal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${SOURCE_PATH}/doc/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/license.txt ${CURRENT_PACKAGES_DIR}/share/decimal-for-cpp/copyright)
 

ports/doctest/CONTROL

@@ -1,3 +1,3 @@
 Source: doctest
-Version: 2.2.3
+Version: 2.3.1
 Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD

ports/doctest/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO onqtam/doctest
-    REF 2.2.3
-    SHA512 764463178ea109d46714751a0e5a74d9896c3cf3f8b8c3424a9252c58d9f2c1a2c7fa7eec68e516fb96f4634ae0078ea00d49d28d45a6331c3ebcbe1ed6b1175
+    REF 2.3.1
+    SHA512 b8cb502054e05d6e348fa008b44eb49e7932e0ee15e413953ecfd3092ebc490e5924ee669f22abb85e349033e307e7e19ad44b0c6a98973a8ffe4c7aef9017b2
     HEAD_REF master
 )
 

ports/draco/CONTROL

@@ -1,4 +1,4 @@
 Source: draco
-Version: 1.3.3
+Version: 1.3.3-1
 Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
 Build-Depends:

ports/draco/fix-compile-error-uwp.patch

@@ -0,0 +1,30 @@
+diff --git a/src/draco/core/symbol_coding_utils.h b/src/draco/core/symbol_coding_utils.h
+index be2183d..eaaca00 100644
+--- a/src/draco/core/symbol_coding_utils.h
++++ b/src/draco/core/symbol_coding_utils.h
+@@ -41,7 +41,9 @@ typename std::make_unsigned<IntTypeT>::type ConvertSignedIntToSymbol(
+   if (val >= 0) {
+     return static_cast<UnsignedType>(val) << 1;
+   }
+-  val = -(val + 1);  // Map -1 to 0, -2 to -1, etc..
++  // Map -1 to 0, -2 to -1, etc..
++  val += 1;
++  val *= -1;
+   UnsignedType ret = static_cast<UnsignedType>(val);
+   ret <<= 1;
+   ret |= 1;
+diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
+index 1aa52cc..cfbbdbd 100644
+--- a/src/draco/io/parser_utils.cc
++++ b/src/draco/io/parser_utils.cc
+@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
+   uint32_t v;
+   if (!ParseUnsignedInt(buffer, &v))
+     return false;
+-  *value = (sign < 0) ? -v : v;
++  if (sign < 0)
++    v *= -1;
++  *value = v;
+   return true;
+ }
+ 

ports/draco/portfile.cmake

@@ -23,6 +23,8 @@ vcpkg_from_github(
     REF 1.3.3
     SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897
     HEAD_REF master
+    PATCHES
+        fix-compile-error-uwp.patch
 )
 
 vcpkg_configure_cmake(

ports/effolkronium-random/CONTROL

@@ -1,3 +1,3 @@
 Source: effolkronium-random
-Version: 1.2.0
+Version: 1.3.0
 Description: Random with a modern C++ API

ports/effolkronium-random/portfile.cmake

@@ -3,14 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO effolkronium/random
-    REF v1.2.0
-    SHA512 92c5447196601d7dfb0320b517494f4e75cb55011c800cd2f18655cd4ab867672ad39830a3dbb3fc5f39a41c8ae03b6a6910f1eac4a2f131cffca896554be561
+    REF v1.3.0
+    SHA512 68bd42e696a784832376950df7df9ddc8fc52ad073f44eddc7bcc2547278096ad3ec6463ce3a0e2e60a223e0852e68be4c2e9bcec4b237b9017ac2b03d5be812
     HEAD_REF master
 )
 
-vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "effolkronium_random" "effolkronium-random")
-vcpkg_replace_string(${SOURCE_PATH}/cmake/config.cmake.in "effolkronium_random" "effolkronium-random")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -19,7 +16,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium-random)
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium_random)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/effolkronium-random RENAME copyright)

ports/exiv2/CONTROL

@@ -1,4 +1,7 @@
 Source: exiv2
-Version: 2018-11-08
-Build-Depends: zlib, expat, libiconv
+Version: 0.27
+Build-Depends: zlib, expat, libiconv, gettext
 Description: Image metadata library and tools http://www.exiv2.org
+
+Feature: unicode
+Description: Compile with unicode support on windows

ports/exiv2/iconv.patch

@@ -1,28 +1,36 @@
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
-index e220e2f..992b887 100644
 --- a/cmake/findDependencies.cmake
 +++ b/cmake/findDependencies.cmake
-@@ -50,7 +50,7 @@ if( EXIV2_ENABLE_NLS )
-     # the manual check in cmake/generateConfigFile.cmake
+@@ -36,5 +36,5 @@
+ 
+ 
+ if (EXIV2_ENABLE_NLS)
+-    find_package(Intl REQUIRED)
++    find_package(unofficial-gettext CONFIG)
  endif( )
  
--find_package(Iconv)
-+find_package(unofficial-iconv CONFIG REQUIRED)
- if( ICONV_FOUND )
-     message ( "-- ICONV_INCLUDE_DIR : " ${Iconv_INCLUDE_DIR} )
-     message ( "-- ICONV_LIBRARIES : " ${Iconv_LIBRARY} )
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 91469b6..4c51068 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -274,8 +274,8 @@ if( EXIV2_ENABLE_NLS )
-     target_link_libraries( exiv2lib PRIVATE  ${LIBINTL_LIBRARIES} )
+@@ -208,14 +208,14 @@
+ endif()
+ 
+ if( EXIV2_ENABLE_NLS )
+-    target_link_libraries(exiv2lib PRIVATE ${Intl_LIBRARIES})
+-    target_include_directories(exiv2lib PRIVATE ${Intl_INCLUDE_DIRS})
++    target_link_libraries(exiv2lib PRIVATE unofficial::gettext::libintl)
+     # Definition needed for translations
+     target_compile_definitions(exiv2lib PUBLIC EXV_LOCALEDIR="/../${CMAKE_INSTALL_LOCALEDIR}")
  endif()
  
 -if( ICONV_FOUND )
 -    target_link_libraries( exiv2lib PRIVATE Iconv::Iconv )
-+if( ICONV_FOUND OR 1 )
-+    target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv )
- endif()
+-endif()
++if(NOT TARGET unofficial::iconv::libiconv)
++    find_package(unofficial-iconv CONFIG)
++endif()
++target_link_libraries( exiv2lib PRIVATE unofficial::iconv::libiconv )
  
  
+
+ 

ports/exiv2/portfile.cmake

@@ -3,26 +3,44 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Exiv2/exiv2
-    REF 274ef04f7ebbff567135e732434c9c8353265d6c
-    SHA512 8e8d32a4c51da2a61026a4541885da72df88c3e30452944c5e2d2d8e6d8d03dcdea72c4e3bfe9673554453ddc547651d160cfba2bfab1450a1770f4af2be740a
+    REF 0.27
+    SHA512 ec605db73abcf3cc2df78c1fc3aae5335a51192f660668e39a4f20fc7f372b18c3cec9b704e1c71c356315fd75e791622de1dffe576432ee0fb12bf63a98a423
     HEAD_REF master
-    PATCHES iconv.patch
+    PATCHES
+        iconv.patch
 )
 
+if(WIN32 AND ("unicode" IN_LIST FEATURES))
+    set(enable_win_unicode TRUE)
+elseif()
+    set(enable_win_unicode FALSE)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS
+        -DEXIV2_ENABLE_WIN_UNICODE:BOOL=${enable_win_unicode}
+        -DEXIV2_BUILD_EXIV2_COMMAND:BOOL=FALSE
+        -DEXIV2_BUILD_UNIT_TESTS:BOOL=FALSE
+        -DEXIV2_BUILD_SAMPLES:BOOL=FALSE
+#        -DEXIV2_ENABLE_NLS:BOOL=OFF
 )
 
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH "share/exiv2/cmake")
 
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+    ${CURRENT_PACKAGES_DIR}/share/exiv2
+    @ONLY
+)
+
 vcpkg_copy_pdbs()
 
 # Clean
-file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${EXE} ${DEBUG_EXE})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

ports/exiv2/vcpkg-cmake-wrapper.cmake

@@ -0,0 +1,11 @@
+_find_package(${ARGS})
+
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    find_package(unofficial-iconv CONFIG REQUIRED)
+    find_package(unofficial-gettext CONFIG REQUIRED)
+    if(TARGET exiv2lib)
+        set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES 
+            unofficial::iconv::libiconv 
+            unofficial::gettext::libintl)
+    endif()
+endif()

ports/fcl/CONTROL

@@ -1,4 +1,4 @@
 Source: fcl
-Version: 0.5.0-3
+Version: 0.5.0-4
 Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
 Build-Depends: ccd, octomap

ports/fcl/portfile.cmake

@@ -36,7 +36,12 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/")
+if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fcl")
+endif()
+
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG)
 string(REPLACE "unset(_expectedTargets)"

ports/freeimage/CONTROL

@@ -1,4 +1,4 @@
 Source: freeimage
-Version: 3.18.0-3
+Version: 3.18.0-4
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr
 Description: Support library for graphics image formats

ports/freeimage/use-external-libtiff.patch

@@ -1,8 +1,8 @@
 diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
-index 1b45453..562fdd7 100644
+index 5068d94..8947b03 100644
 --- a/Source/FreeImage/PluginTIFF.cpp
 +++ b/Source/FreeImage/PluginTIFF.cpp
-@@ -37,7 +37,7 @@
+@@ -37,9 +37,9 @@
  
  #include "FreeImage.h"
  #include "Utilities.h"
@@ -11,6 +11,36 @@ index 1b45453..562fdd7 100644
  #include "../Metadata/FreeImageTag.h"
  #include "../OpenEXR/Half/half.h"
  
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+@@ -199,15 +199,18 @@ Open a TIFF file for reading or writing
+ @param name
+ @param mode
+ */
++/*
+ TIFF*
+ TIFFOpen(const char* name, const char* mode) {
+ 	return 0;
+ }
++*/
+ 
+ // ----------------------------------------------------------
+ //   TIFF library FreeImage-specific routines.
+ // ----------------------------------------------------------
+ 
++/*
+ void*
+ _TIFFmalloc(tmsize_t s) {
+ 	return malloc(s);
+@@ -245,6 +248,7 @@ int
+ _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c) {
+ 	return (memcmp(p1, p2, (size_t) c));
+ }
++*/
+ 
+ // ----------------------------------------------------------
+ //   in FreeImage warnings and errors are disabled
+ 
 diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
 index d5be902..8dbcd5d 100644
 --- a/Source/Metadata/XTIFF.cpp

ports/freeopcua/CONTROL

@@ -1,4 +1,4 @@
 Source: freeopcua
-Version: 20190125
+Version: 20190125-1
 Description: OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.
 Build-Depends: boost-asio,boost-system,boost-program-options,boost-filesystem,boost-thread,boost-format,boost-foreach,boost-property-tree,boost-date-time

ports/freeopcua/cmakelists_fixes.patch

@@ -1,17 +1,22 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de03564..2637355 100644
+index de03564..df3fcf6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,6 +6,8 @@ if( NOT CMAKE_BUILD_TYPE )
- endif()
+@@ -1,11 +1,8 @@
+ cmake_minimum_required(VERSION 2.8)
  
+-#It seems Cmake does not set default bild type so we force it
+-if( NOT CMAKE_BUILD_TYPE )
+-    set( CMAKE_BUILD_TYPE Debug CACHE STRING "Debug" FORCE )
+-endif()
+-
  project(freeopcua)
 +set(CMAKE_CXX_STANDARD 11)
 +set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  
  option(BUILD_CLIENT "Build Client" ON)
  option(BUILD_SERVER "Build Server" ON)
-@@ -16,28 +18,6 @@ option(BUILD_PYTHON "Build Python bindings" ON)
+@@ -16,28 +13,6 @@ option(BUILD_PYTHON "Build Python bindings" ON)
  option(BUILD_TESTING "Build and run tests" OFF)
  OPTION(BUILD_SHARED_LIBS "Build shared libraries." ON)
  
@@ -40,7 +45,7 @@ index de03564..2637355 100644
  # Helper function to generate a pkg-config file for a single library
  # Takes the filename of the .pc file as a parameter and replaces all
  # placeholders in the .pc.in file with the actual values
-@@ -60,23 +40,12 @@ function(generate_pkgconfig BASENAME)
+@@ -60,23 +35,9 @@ function(generate_pkgconfig BASENAME)
      endif()
  endfunction(generate_pkgconfig)
  if(MSVC)
@@ -63,14 +68,11 @@ index de03564..2637355 100644
 -    #set(CMAKE_SHARED_LINKER_FLAGS "--no-undefined" )
 +    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 +    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+    add_definitions(-D_WIN32)
-+    add_definitions(-D_WINDOWS)
-+    add_definitions(-D_WIN32_WINNT=0x0600)
 +    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
  endif()
  
  if(WIN32)
-@@ -105,7 +74,7 @@ else(WIN32)
+@@ -105,7 +66,7 @@ else(WIN32)
  
  endif(WIN32)
  
@@ -79,7 +81,7 @@ index de03564..2637355 100644
  include_directories( ${Boost_INCLUDE_DIRS} )
  link_directories( ${Boost_LIBRARY_DIRS} )
  message(STATUS "Boost INCLUDE DIR IS: " ${Boost_INCLUDE_DIRS})
-@@ -185,9 +154,6 @@ add_library(opcuaprotocol
+@@ -185,14 +146,12 @@ add_library(opcuaprotocol
      src/protocol/subscriptions.cpp
  )
  
@@ -89,7 +91,14 @@ index de03564..2637355 100644
  target_link_libraries(opcuaprotocol ${ADDITIONAL_LINK_LIBRARIES})
  target_include_directories(opcuaprotocol PUBLIC $<INSTALL_INTERFACE:include>)
  install(TARGETS opcuaprotocol EXPORT FreeOpcUa
-@@ -227,10 +193,6 @@ if (BUILD_TESTING)
++                              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+                               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
++                              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ generate_pkgconfig("libopcuaprotocol.pc")
+ 
+@@ -227,10 +186,6 @@ if (BUILD_TESTING)
          gtest_main
      )
  
@@ -100,7 +109,7 @@ index de03564..2637355 100644
      add_test(NAME opcuaprotocol COMMAND test_opcuaprotocol)
  endif()
  
-@@ -266,11 +228,7 @@ SET(opcuacore_SOURCES
+@@ -266,15 +221,12 @@ SET(opcuacore_SOURCES
  
  add_library(opcuacore ${opcuacore_SOURCES})
  
@@ -112,17 +121,23 @@ index de03564..2637355 100644
 +target_link_libraries(opcuacore ${ADDITIONAL_LINK_LIBRARIES} opcuaprotocol ${Boost_LIBRARIES})
  target_include_directories(opcuacore PUBLIC $<INSTALL_INTERFACE:include>)
  install(TARGETS opcuacore EXPORT FreeOpcUa
++                          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
                            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -306,7 +264,7 @@ if (BUILD_TESTING)
+-                          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
++                          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ generate_pkgconfig("libopcuacore.pc")
+ 
+@@ -306,7 +258,7 @@ if (BUILD_TESTING)
      )
  
      if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
 -        target_compile_options(test_opcuacore PUBLIC ${D}DYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${EXECUTABLE_CXX_FLAGS})
-+        target_compile_options(test_opcuacore PUBLIC ${D}DYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" )
++        target_compile_options(test_opcuacore PUBLIC -DDYNAMIC_ADDON_PATH="${DYNAMIC_ADDON_PATH}" -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" )
      endif ()
  
      add_test(NAME opcuacore COMMAND test_opcuacore)
-@@ -327,9 +285,6 @@ if (BUILD_CLIENT)
+@@ -327,9 +279,6 @@ if (BUILD_CLIENT)
      src/client/client.cpp
      )
  
@@ -132,7 +147,18 @@ index de03564..2637355 100644
      target_link_libraries(opcuaclient
          opcuacore
          ${ADDITIONAL_LINK_LIBRARIES}
-@@ -371,9 +326,6 @@ if (BUILD_CLIENT)
+@@ -338,8 +287,9 @@ if (BUILD_CLIENT)
+ 
+     target_include_directories(opcuaclient PUBLIC $<INSTALL_INTERFACE:include>)
+     install(TARGETS opcuaclient EXPORT FreeOpcUa
++                                RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+                                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-                                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
++                                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+     generate_pkgconfig("libopcuaclient.pc")
+ 
+@@ -371,9 +321,6 @@ if (BUILD_CLIENT)
          opcuacore
      )
  
@@ -142,7 +168,7 @@ index de03564..2637355 100644
  endif(BUILD_CLIENT)
  
  
-@@ -423,10 +375,7 @@ if(BUILD_SERVER)
+@@ -423,14 +370,12 @@ if(BUILD_SERVER)
          src/server/subscription_service_internal.cpp
          )
  
@@ -153,17 +179,23 @@ index de03564..2637355 100644
 +    target_link_libraries(opcuaserver ${ADDITIONAL_LINK_LIBRARIES} opcuacore opcuaprotocol ${Boost_LIBRARIES})
      target_include_directories(opcuaserver PUBLIC $<INSTALL_INTERFACE:include>)
      install(TARGETS opcuaserver EXPORT FreeOpcUa
++                                RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
                                  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -481,7 +430,7 @@ if(BUILD_SERVER)
+-                                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static)
++                                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+     generate_pkgconfig("libopcuaserver.pc")
+ 
+@@ -481,7 +426,7 @@ if(BUILD_SERVER)
  
          target_include_directories(test_opcuaserver PUBLIC .)
          if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
 -            target_compile_options(test_opcuaserver PUBLIC ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}" ${STATIC_LIBRARY_CXX_FLAGS})
-+            target_compile_options(test_opcuaserver PUBLIC ${D}TEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}")
++            target_compile_options(test_opcuaserver PUBLIC -DTEST_CORE_CONFIG_PATH="${TEST_CORE_CONFIG_PATH}")
          endif ()
  
          add_test(NAME opcuaserverapp COMMAND test_opcuaserver)
-@@ -510,9 +459,6 @@ if(BUILD_SERVER)
+@@ -510,9 +455,6 @@ if(BUILD_SERVER)
          opcuaserver
          ${Boost_PROGRAM_OPTIONS_LIBRARY}
          )
@@ -173,7 +205,7 @@ index de03564..2637355 100644
  
  endif(BUILD_SERVER)
  
-@@ -533,9 +479,6 @@ if (BUILD_CLIENT)
+@@ -533,9 +475,6 @@ if (BUILD_CLIENT)
          ${SSL_SUPPORT_LINK_LIBRARIES}
      )
  
@@ -183,7 +215,7 @@ index de03564..2637355 100644
  
  endif (BUILD_CLIENT)
  
-@@ -555,9 +498,6 @@ if(BUILD_SERVER)
+@@ -555,9 +494,6 @@ if(BUILD_SERVER)
      opcuaserver
      )
  
@@ -193,12 +225,14 @@ index de03564..2637355 100644
      if(MSVC)
          set_target_properties(example_server PROPERTIES LINK_FLAGS /STACK:3000000)
      endif(MSVC)
-@@ -572,7 +512,7 @@ if (BUILD_PYTHON)
+@@ -572,8 +508,8 @@ if (BUILD_PYTHON)
      add_subdirectory(python)
  endif (BUILD_PYTHON)
  
 -install(EXPORT FreeOpcUa DESTINATION lib/cmake/FreeOpcUa FILE FreeOpcUaConfig.cmake)
-+install(EXPORT FreeOpcUa DESTINATION share/freeopcua FILE FreeOpcUaConfig.cmake)
++install(EXPORT FreeOpcUa DESTINATION share/freeopcua FILE freeopcuaConfig.cmake)
  
  SET(CPACK_GENERATOR "DEB")
- SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "FreeOpcUa")
+-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "FreeOpcUa")
++SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "freeopcua")
+ INCLUDE(CPack)

ports/freeopcua/portfile.cmake

@@ -22,12 +22,11 @@ vcpkg_configure_cmake(
       -DBUILD_PYTHON=OFF
       -DBUILD_TESTING=OFF
       -DSSL_SUPPORT_MBEDTLS=OFF
+      -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
-
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/freeopcua/FreeOpcUaConfig-debug.cmake ${CURRENT_PACKAGES_DIR}/share/freeopcua/FreeOpcUaConfig-debug.cmake)
-file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/freeopcua/FreeOpcUaConfig.cmake ${CURRENT_PACKAGES_DIR}/share/freeopcua/FreeOpcUaConfig.cmake)
+vcpkg_fixup_cmake_targets()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 

ports/freetype/0005-Fix-DLL-EXPORTS.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd8a878..75f9ab7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,7 +141,7 @@ set(VERSION_PATCH "1")
+ #     Increment REVISION.
+ set(LIBRARY_VERSION "6.16.0")
+ set(LIBRARY_SOVERSION "6")
+-
++ADD_DEFINITIONS(-DDLL_EXPORT)
+ # These options mean "require x and complain if not found". They'll get
+ # optionally found anyway. Use `-DCMAKE_DISABLE_FIND_PACKAGE_x=TRUE` to disable
+ # searching for a packge entirely (x is the CMake package name, so "BZip2"

ports/freetype/portfile.cmake

@@ -6,7 +6,9 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "freetype-${FT_VERSION}.tar.bz2"
     SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
 )
-vcpkg_extract_source_archive_ex(
+
+if(NOT ${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic")
+    vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${FT_VERSION}
@@ -15,7 +17,20 @@ vcpkg_extract_source_archive_ex(
         0002-Add-CONFIG_INSTALL_PATH-option.patch
         0003-Fix-UWP.patch
         0004-Fix-DLL-install.patch
-)
+    )
+else()
+    vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${FT_VERSION}
+    PATCHES
+        0001-Fix-install-command.patch
+        0002-Add-CONFIG_INSTALL_PATH-option.patch
+        0003-Fix-UWP.patch
+        0004-Fix-DLL-install.patch
+        0005-Fix-DLL-EXPORTS.patch
+    )
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -26,6 +41,7 @@ vcpkg_configure_cmake(
         -DFT_WITH_BZIP2=ON
         -DFT_WITH_PNG=ON
         -DFT_WITH_HARFBUZZ=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
 )
 
 vcpkg_install_cmake()

ports/gdal/0001-Fix-debug-crt-flags.patch

@@ -1,9 +1,6 @@
-diff -Nuar a/nmake.opt b/nmake.opt
---- a/nmake.opt	2018-05-04 09:05:46.000000000 +0200
-+++ b/nmake.opt	2018-05-11 22:58:39.387603800 +0200
-@@ -124,11 +124,21 @@
- CXX_PDB_FLAGS=
- !ENDIF
+--- a/nmake.opt	Fri Dec 14 22:34:20 2018
++++ b/nmake.opt	Wed Mar 27 11:00:00 2019
+@@ -133,7 +133,17 @@
  
 +# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd)
 +# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well
@@ -16,12 +13,10 @@ diff -Nuar a/nmake.opt b/nmake.opt
 +!ENDIF
 +
  !IFNDEF OPTFLAGS
- !IFNDEF DEBUG
+ !IF "$(DEBUG)" == "0"
 -OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
 +OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
  !ELSE
 -OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
 +OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
  !ENDIF
- !ENDIF  # OPTFLAGS
- 

ports/gdal/0002-Fix-static-build.patch

@@ -0,0 +1,27 @@
+--- a/makefile.vc	Fri Dec 14 22:34:20 2018
++++ b/makefile.vc	Wed Mar 27 11:00:00 2019
+@@ -60,3 +60,3 @@
+ 
+-default:	$(TARGET_LIB) $(PLUGIN_TARGET) apps_dir
++default:	$(TARGET_LIB) $(PLUGIN_TARGET)
+ 
+@@ -227,4 +227,2 @@
+ 	$(MAKE) /f makefile.vc plugins-install
+-	cd ..\apps
+-	$(MAKE) /f makefile.vc install
+ 	cd ..
+@@ -232,8 +230,2 @@
+ 	$(INSTALL) LICENSE.TXT $(DATADIR)
+-!IFDEF HTMLDIR
+-	-mkdir $(HTMLDIR)
+-	cd frmts
+-	$(MAKE) /f makefile.vc html-install
+-	cd ..
+-!ENDIF
+ !IFDEF INCLUDE_OGR_FRMTS
+@@ -241,5 +233,2 @@
+ 	$(MAKE) /f makefile.vc plugins-install
+-!IFDEF HTMLDIR
+-	$(MAKE) /f makefile.vc html-install
+-!ENDIF
+ 	cd ..\..

ports/gdal/CONTROL

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

ports/gdal/portfile.cmake

@@ -11,9 +11,7 @@ if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "GDAL's nmake buildsystem does not support building static libraries")
-elseif(VCPKG_CRT_LINKAGE STREQUAL "static")
-    message(FATAL_ERROR "GDAL's nmake buildsystem does not support static crt linkage")
+    list(APPEND NMAKE_OPTIONS "DLLBUILD=0")
 endif()
 
 include(vcpkg_common_functions)
@@ -43,6 +41,7 @@ foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
         SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
         PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-static-build.patch
     )
 endforeach()
 
@@ -64,8 +63,13 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRA
 
 # Setup geos libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
+else()
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
+endif()
 
 # Setup expat libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR)
@@ -155,6 +159,7 @@ endif()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     list(APPEND NMAKE_OPTIONS PROJ_FLAGS=-DPROJ_STATIC)
+    list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB)
 else()
     # Enables PDBs for release and debug builds
     list(APPEND NMAKE_OPTIONS WITH_PDB=1)
@@ -175,11 +180,14 @@ list(APPEND NMAKE_OPTIONS_REL
     EXPAT_LIB=${EXPAT_LIBRARY_REL}
     "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib"
     SQLITE_LIB=${SQLITE_LIBRARY_REL}
-    PG_LIB=${PGSQL_LIBRARY_REL}
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
     WEBP_LIBS=${WEBP_LIBRARY_REL}
     LIBXML2_LIB=${XML2_LIBRARY_REL}
 )
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Static Build does not like PG_LIB
+    list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL})
+endif()
 
 list(APPEND NMAKE_OPTIONS_DBG
     ${NMAKE_OPTIONS}
@@ -190,12 +198,15 @@ list(APPEND NMAKE_OPTIONS_DBG
     EXPAT_LIB=${EXPAT_LIBRARY_DBG}
     "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib"
     SQLITE_LIB=${SQLITE_LIBRARY_DBG}
-    PG_LIB=${PGSQL_LIBRARY_DBG}
     OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
     WEBP_LIBS=${WEBP_LIBRARY_DBG}
     LIBXML2_LIB=${XML2_LIBRARY_DBG}
     DEBUG=1
 )
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    # Static Build does not like PG_LIB
+    list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG})
+endif()
 
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
   ################
@@ -226,7 +237,10 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
 endif()
 
 message(STATUS "Packaging ${TARGET_TRIPLET}")
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html)
+
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html)
+endif()
 
 vcpkg_execute_required_process(
   COMMAND ${NMAKE} -f makefile.vc
@@ -249,6 +263,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib   DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
     file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
   endif()
+
 else()
 
   set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal)

ports/giflib/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(giflib)
+project(giflib C)
 
 set(GIFLIB_HEADERS
     lib/gif_lib.h
@@ -17,10 +17,8 @@ set(GIFLIB_SOURCES
     lib/quantize.c
 )
 
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 add_library(gif ${GIFLIB_SOURCES})
-if (BUILD_SHARED_LIBS)
-    set_property(TARGET gif PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif ()
 
 if (NOT GIFLIB_SKIP_HEADERS)
     install(FILES ${GIFLIB_HEADERS} DESTINATION include)

ports/giflib/CONTROL

@@ -1,3 +1,3 @@
 Source: giflib
-Version: 5.1.4-1
+Version: 5.1.4-3
 Description: A library for reading and writing gif images.

ports/giflib/fix-compile-error.patch

@@ -0,0 +1,76 @@
+diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
+index fddc0d2..7a6ab9c 100644
+--- a/lib/dgif_lib.c
++++ b/lib/dgif_lib.c
+@@ -54,7 +54,7 @@ DGifOpenFileName(const char *FileName, int *Error)
+     int FileHandle;
+     GifFileType *GifFile;
+ 
+-    if ((FileHandle = open(FileName, O_RDONLY)) == -1) {
++    if ((FileHandle = _open(FileName, O_RDONLY)) == -1) {
+ 	if (Error != NULL)
+ 	    *Error = D_GIF_ERR_OPEN_FAILED;
+         return NULL;
+@@ -81,7 +81,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
+     if (GifFile == NULL) {
+         if (Error != NULL)
+ 	    *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+-        (void)close(FileHandle);
++        (void)_close(FileHandle);
+         return NULL;
+     }
+ 
+@@ -95,7 +95,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
+     if (Private == NULL) {
+         if (Error != NULL)
+ 	    *Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+-        (void)close(FileHandle);
++        (void)_close(FileHandle);
+         free((char *)GifFile);
+         return NULL;
+     }
+@@ -106,7 +106,7 @@ DGifOpenFileHandle(int FileHandle, int *Error)
+     _setmode(FileHandle, O_BINARY);    /* Make sure it is in binary mode. */
+ #endif /* _WIN32 */
+ 
+-    f = fdopen(FileHandle, "rb");    /* Make it into a stream: */
++    f = _fdopen(FileHandle, "rb");    /* Make it into a stream: */
+ 
+     /*@-mustfreeonly@*/
+     GifFile->Private = (void *)Private;
+diff --git a/lib/egif_lib.c b/lib/egif_lib.c
+index f30b61b..18dc4a2 100644
+--- a/lib/egif_lib.c
++++ b/lib/egif_lib.c
+@@ -60,10 +60,10 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error)
+     GifFileType *GifFile;
+ 
+     if (TestExistence)
+-        FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL, 
++        FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_EXCL, 
+ 			  S_IREAD | S_IWRITE);
+     else
+-        FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC, 
++        FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_TRUNC, 
+ 			  S_IREAD | S_IWRITE);
+ 
+     if (FileHandle == -1) {
+@@ -73,7 +73,7 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error)
+     }
+     GifFile = EGifOpenFileHandle(FileHandle, Error);
+     if (GifFile == (GifFileType *) NULL)
+-        (void)close(FileHandle);
++        (void)_close(FileHandle);
+     return GifFile;
+ }
+ 
+@@ -118,7 +118,7 @@ EGifOpenFileHandle(const int FileHandle, int *Error)
+     _setmode(FileHandle, O_BINARY);    /* Make sure it is in binary mode. */
+ #endif /* _WIN32 */
+ 
+-    f = fdopen(FileHandle, "wb");    /* Make it into a stream: */
++    f = _fdopen(FileHandle, "wb");    /* Make it into a stream: */
+ 
+     GifFile->Private = (void *)Private;
+     Private->FileHandle = FileHandle;
+

ports/giflib/portfile.cmake

@@ -1,19 +1,25 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/giflib-5.1.4)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+set(GIFLIB_VERSION 5.1.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-5.1.4.tar.bz2"
-    FILENAME "giflib-5.1.4.tar.bz2"
+    URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"
+    FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2"
     SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${GIFLIB_VERSION}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/msvc-guard-unistd-h.patch
+        msvc-guard-unistd-h.patch
+        fix-compile-error.patch
 )
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG

ports/glew/CONTROL

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

ports/glew/portfile.cmake

@@ -3,7 +3,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0)
 
 # Don't change to vcpkg_from_github! The github-auto-generated archives are missing some files.
-# More info: https://github.com/nigels-com/glew/issues/31
+# More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz"
     FILENAME "glew-2.1.0.tgz"
@@ -13,7 +13,9 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/build/cmake
-)
+    OPTIONS
+        -DBUILD_UTILS=OFF
+    )
 
 vcpkg_install_cmake()
 
@@ -40,11 +42,6 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib)
     file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib)
 endif()
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/visualinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/visualinfo.exe)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)

ports/grpc/CONTROL

@@ -1,4 +1,4 @@
 Source: grpc
-Version: 1.18.0
+Version: 1.19.1
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
 Description: An RPC library and framework

ports/grpc/portfile.cmake

@@ -11,8 +11,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF v1.18.0
-    SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
+    REF v1.19.1
+    SHA512  4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142
     HEAD_REF master
     PATCHES fix-uwp.patch
 )

ports/hungarian/CMakeLists.txt

@@ -0,0 +1,29 @@
+cmake_minimum_required (VERSION 3.8)
+project (hungarian C)
+
+add_library(hungarian
+  ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.h
+  ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.c
+)
+
+target_include_directories(hungarian PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libhungarian>
+  $<INSTALL_INTERFACE:include>
+)
+
+set_target_properties(hungarian PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/libhungarian/hungarian.h)
+
+install(
+  TARGETS hungarian
+  EXPORT hungarian
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  PUBLIC_HEADER DESTINATION include
+)
+
+install(EXPORT hungarian
+    DESTINATION "share/hungarian"
+    FILE hungarianConfig.cmake
+    NAMESPACE hungarian::
+)

ports/hungarian/CONTROL

@@ -0,0 +1,3 @@
+Source: hungarian
+Version: v0.1.3
+Description: C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase

ports/hungarian/LICENSE.txt

@@ -0,0 +1,24 @@
+/********************************************************************
+ ********************************************************************
+ **
+ ** libhungarian by Cyrill Stachniss, 2004
+ **
+ **
+ ** Solving the Minimum Assignment Problem using the
+ ** Hungarian Method.
+ **
+ ** ** This file may be freely copied and distributed! **
+ **
+ ** Parts of the used code was originally provided by the
+ ** "Stanford GraphGase", but I made changes to this code.
+ ** As asked by  the copyright node of the "Stanford GraphGase",
+ ** I hereby proclaim that this file are *NOT* part of the
+ ** "Stanford GraphGase" distrubition!
+ **
+ ** This file is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied
+ ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ ** PURPOSE.
+ **
+ ********************************************************************
+ ********************************************************************/

ports/hungarian/portfile.cmake

@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www2.informatik.uni-freiburg.de/~stachnis/misc/libhungarian-v0.1.3.tgz"
+    FILENAME "libhungarian-v0.1.3.tgz"
+    SHA512 1fa105e351c307c07bb96892c9d4c44b167d92cbed80962a8653ac35b8afe00fcf5dcc2d920b95671d6c3cd86745362a64dd8dc173623a8179006e2c7b2cbc69
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    NO_REMOVE_ONE_LEVEL
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/hungarian RENAME copyright)

ports/ismrmrd/CONTROL

@@ -1,4 +1,8 @@
 Source: ismrmrd
-Version: 1.3.2-2
+Version: 1.3.2-3
 Description: ISMRM Raw Data Format
 Build-Depends: pugixml
+
+Feature: dataset
+Description: Dataset and file support
+Build-Depends: hdf5

ports/ismrmrd/optional_hdf5_dependency.patch

@@ -0,0 +1,77 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 456d4f4..3c235f2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,6 +7,7 @@ set (ISMRMRD_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
+ 
+ # command line options
+ option(USE_SYSTEM_PUGIXML "Use pugixml installed on the system" OFF)
++option(USE_HDF5_DATASET_SUPPORT "Use HDF5 library for dataset support" OFF)
+ 
+ # and include it to the search list
+ list(APPEND CMAKE_MODULE_PATH ${ISMRMRD_CMAKE_DIR})
+@@ -91,18 +92,23 @@ endif()
+ set(ISMRMRD_VERSION_STRING ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
+ set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})
+ 
+-# Find HDF5 for dataset support
+-find_package(HDF5 1.8 COMPONENTS C)
+-
+-if (HDF5_FOUND)
+-    set (ISMRMRD_DATASET_SUPPORT true)
+-    set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
+-    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
+-    set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
+-else (HDF5_FOUND)
++if (USE_HDF5_DATASET_SUPPORT)
++    # Find HDF5 for dataset support
++    find_package(HDF5 1.8 COMPONENTS C)
++
++    if (HDF5_FOUND)
++        set (ISMRMRD_DATASET_SUPPORT true)
++        set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
++        set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
++        set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
++    elseif (USE_HDF5_DATASET_SUPPORT)
++        set (ISMRMRD_DATASET_SUPPORT false)
++        # Dataset and file support was explicitly requested, force failure rather than succeed without support.
++        message (FATAL_ERROR "HDF5 not found. Dataset and file support unavailable!")
++    endif (HDF5_FOUND)
++else (USE_HDF5_DATASET_SUPPORT)
+     set (ISMRMRD_DATASET_SUPPORT false)
+-    message (WARNING "HDF5 not found. Dataset and file support unavailable!")
+-endif (HDF5_FOUND)
++endif (USE_HDF5_DATASET_SUPPORT)
+ 
+ # Generate the version.h header file
+ find_package(Git)
+@@ -127,7 +133,7 @@ install(FILES ${CMAKE_BINARY_DIR}/include/ismrmrd/version.h DESTINATION include/
+ 
+ #  ---   Main Library  (begin) ----
+ # in windows, install the HDF5 dependencies
+-if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
++if (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
+     if(DEFINED ENV{HDF5_ROOT})
+         set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
+     else (DEFINED ENV{HDF5_ROOT})
+@@ -135,7 +141,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
+     endif (DEFINED ENV{HDF5_ROOT})
+     message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
+     install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )
+-endif (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
++endif (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
+ 
+ # include directories for main library
+ set(ISMRMRD_TARGET_INCLUDE_DIRS
+@@ -199,9 +205,9 @@ install(FILES cmake/FindIsmrmrd.cmake cmake/FindFFTW3.cmake DESTINATION share/is
+ add_subdirectory(doc)
+ 
+ add_subdirectory(utilities)
+-if (HDF5_FOUND)
++if (USE_HDF5_DATASET_SUPPORT)
+     add_subdirectory(examples/c)
+-endif (HDF5_FOUND)
++endif (USE_HDF5_DATASET_SUPPORT)
+ 
+ # TODO: make this work on Windows
+ if (NOT WIN32)

ports/ismrmrd/portfile.cmake

@@ -10,12 +10,23 @@ vcpkg_from_github(
     REF v1.3.2
     SHA512 eb806f71c4b183105b3270d658a68195e009c0f7ca37f54f76d650a4d5c83c44d26b5f12a4c47c608aae9990cd04f1204b0c57e6438ca34a271fd54880133106
     HEAD_REF master
+	PATCHES
+		# Makes optional hdf5 dependency explicit
+		optional_hdf5_dependency.patch
 )
 
+if ("dataset" IN_LIST FEATURES)
+    set(ENABLE_DATASET ON)
+else()
+    set(ENABLE_DATASET OFF)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DUSE_SYSTEM_PUGIXML=ON
+    OPTIONS 
+		-DUSE_SYSTEM_PUGIXML=ON
+		-DUSE_HDF5_DATASET_SUPPORT=${ENABLE_DATASET}
 )
 
 vcpkg_install_cmake()

ports/jemalloc/CONTROL

@@ -1,4 +1,4 @@
 Source: jemalloc
-Version: 4.3.1-2
+Version: 4.3.1-3
 Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
 Build-Depends:

ports/jemalloc/fix-static-build.patch

@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b8959a..55e6a5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -826,10 +826,16 @@ 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 (without-export)
++    install(TARGETS ${C_JETLIB}
++            LIBRARY DESTINATION lib
++            ARCHIVE DESTINATION lib)
++else()
++    install(TARGETS ${LIBJEMALLOCSO}
++            RUNTIME DESTINATION bin
++            LIBRARY DESTINATION lib
++            ARCHIVE DESTINATION lib)
++endif()
+ if (build-tests)
+ ##################################################################
+ # Common source for Unit, Integration and stress test libraries

ports/jemalloc/portfile.cmake

@@ -11,19 +11,22 @@ vcpkg_from_github(
     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"
+        fix-cmakelists.patch
+        fix-utilities.patch
+        fix-static-build.patch
 )
 
+if (VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    set(BUILD_STATIC_LIBRARY OFF)
+else()
+    set(BUILD_STATIC_LIBRARY ON)
+endif()
 vcpkg_configure_cmake(
     DISABLE_PARALLEL_CONFIGURE
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+    OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -Dwithout-export=${BUILD_STATIC_LIBRARY}
 )
 
 vcpkg_install_cmake()

ports/json-dto/CONTROL

@@ -1,4 +1,4 @@
 Source: json-dto
-Version: 0.2.6
+Version: 0.2.8
 Description: A small header-only library for converting data between json representation and c++ structs.
 Build-Depends: rapidjson

ports/json-dto/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO sobjectizerteam/json_dto-0.2
-    REF v.0.2.6
-    SHA512 f6562b6177c941a9b898013eacb4bd78f2b8d460a82b773824bf51e106a92c27c52dca4ab6dd07a2d5e063ca3442a20c27dfd80bdcd78207e65f328b95972890
+    REF v.0.2.8
+    SHA512 50a2d8d31f4cf67bdf84a58bae5f95642f4be571e8e052a48830be119d5e3c4ddbb19c5ac97fc0f8383c9958d64ec9be4ce23019c1da4f2cbf4b8ddbf23f5ad7
 )
 
 vcpkg_configure_cmake(