Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5058

30 files changed, 120 insertions, 60 deletions

diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index c5e51adaf..51efe3f6f 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-c-shared-utility
-Version: 1.1.11-1
+Version: 1.1.11-3
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux)
diff --git a/ports/azure-c-shared-utility/no-double-expand-cmake.patch b/ports/azure-c-shared-utility/no-double-expand-cmake.patch
new file mode 100644
index 000000000..3775ad6b5
--- /dev/null
+++ b/ports/azure-c-shared-utility/no-double-expand-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 190ea87..a434cee 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -264,7 +264,7 @@ if(${use_applessl})

+     include_directories(./pal/ios-osx/)

+ endif()

+ 

+-if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0"))

++if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0"))

+     # Windows added support for UNIX domain sockets to the OS and SDK

+     # in the Oct 2018 update (10.0.17763.0, aka RS5)

+     add_definitions(-DAF_UNIX_ON_WINDOWS)

diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index 838528ce4..cc4514dfe 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-c-shared-utility
-    REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3
-    SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1
+    REF 1d622902d7842f94193fc394987f2b4e978bb700
+    SHA512 e7b3671955aeefe8e748bc68dd9f914fbb86c9cf325606691efc332cffa0d80b61f87d5f5c1026676c35fd1c5e88f22ca60f2e811c351aeba659f810fdc52e84
     HEAD_REF master
+    PATCHES no-double-expand-cmake.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 9c9410bfe..0164d44a0 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-iot-sdk-c
-Version: 1.2.11-1
+Version: 1.2.12-1
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 6ec8ba3eb..2b1ef492c 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-iot-sdk-c
-    REF acff8b1677150cb165a7b111745144cf8fab76cc
-    SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28
+    REF 350b51f5abaedc975dae5419ad1fa4add7635fd2
+    SHA512 7559768f7d1c67f6b28d16871c3c783e9f88d9dc4f9051a7a3c0329311d39821301edf64fcbde15a8e904c6d5a6326feee25be8e46cb657c21455ae920b266eb
     HEAD_REF master
     PATCHES improve-external-deps.patch
 )
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index 8f5f63c08..062c02bef 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-uamqp-c
-Version: 1.2.11-1
+Version: 1.2.11-2
 Build-Depends: azure-c-shared-utility
 Description: AMQP library for C
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index 0f7591099..b7ee41625 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uamqp-c
-    REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa
-    SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58
+    REF f29401ab5eb3853390d5f573d8fb37c0c96dba16
+    SHA512 8fdee32e2a85218257ee91754873f9f8ae5e16cd2b7b10c88ab6d4115fe4378a2b08f211d8307346b0bd7688c4c896c25a4de34e9231c2506819a97bbf46dd73
     HEAD_REF master
 )
 
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index de34ba4dd..64834510d 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-uhttp-c
-    REF ed7d104c4ab96aaa68e429066953874f12be70eb
-    SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f
+    REF 647ec7cc75961cd7ff7cbb7eca30e1de819802ed
+    SHA512 1768ea978ab7fa328b74444573c3d1eb2a5fae1e36dbe1dcc186df3e2ab2a0a3b1ba8a434934462184582525b3a1850fc04ca2927f95f0df0ae483f8a1673e30
     HEAD_REF master
 )
 
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 9a5f5e030..407844601 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,4 +1,4 @@
 Source: azure-umqtt-c
-Version: 1.1.11-1
+Version: 1.1.11-2
 Build-Depends: azure-c-shared-utility
 Description: General purpose library for communication over the mqtt protocol
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index cb14cfaa8..6bfb77f89 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-umqtt-c
-    REF ff05514c9b4742ae8d7785719a399a7fe6eac09b
-    SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081
+    REF 3205eb26401e9c6639100934e8fb75b75275760d
+    SHA512 002c0d4f0373faeb7171465afce268f18b52d80ec057af36c81dd807de8ccf2bf1a46ef00c7f8e8fcdbef8d7f5c36616a304007c98ea5700c5f662b4c8868c2c
     HEAD_REF master
 )
 
diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
index 7eaa3d6be..5e51572cc 100644
--- a/ports/cppgraphqlgen/CONTROL
+++ b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen

-Version: 0.6

+Version: 1.0.0

 Build-Depends: pegtl, rapidjson

 Description: C++ GraphQL schema service generator

diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index 70ff81070..926a4ecd2 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -3,17 +3,17 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Microsoft/cppgraphqlgen

-    REF v0.6

-    SHA512 cc2596f5cd975377fcc9432eee11973e2ff044c244c3ac13c3f45549874c2fe0ac5c48bccb96813b48a1b7c940bb54decc194d9eb358c6ae39d1288b9ce58b01

+    REF v1.0.0

+    SHA512 3756c31063dc86d1c37d3cb709221b2b6e7dda5f3405d7586e4f395fd4915b1088c0305b116164c615846413042857fd688e61ef36c5c2aab218cfab8f16370c

     HEAD_REF master

 )

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA # Disable this option if project cannot be built with Ninja

+    PREFER_NINJA

     OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF

-    # OPTIONS_RELEASE -DOPTIMIZE=1

-    # OPTIONS_DEBUG -DDEBUGGABLE=1

+    OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen

+    OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen

 )

 

 vcpkg_install_cmake()

diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL
index dacd86ee9..16dbcfc32 100644
--- a/ports/entityx/CONTROL
+++ b/ports/entityx/CONTROL
@@ -1,3 +1,3 @@
 Source: entityx
-Version: 1.2.0-2
+Version: 1.2.0-3
 Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx>
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
index 5df7da6cd..bc6afccc3 100644
--- a/ports/entityx/portfile.cmake
+++ b/ports/entityx/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DENTITYX_BUILD_TESTING=false
+        -DENTITYX_BUILD_SHARED=0
 )
 
 vcpkg_install_cmake()
diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL
index 859098e30..aa6b868d5 100644
--- a/ports/fmilib/CONTROL
+++ b/ports/fmilib/CONTROL
@@ -1,3 +1,3 @@
 Source: fmilib

-Version: 2.0.3

+Version: 2.0.3-1

 Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/

diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake
index df72dd7ee..5692b7d12 100644
--- a/ports/fmilib/portfile.cmake
+++ b/ports/fmilib/portfile.cmake
@@ -69,6 +69,36 @@ SET(OPTIONS
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR})

 

+if (WIN32) 

+

+    if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")

+        set(GENERATOR "Visual Studio 12 2013")

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")

+        set(GENERATOR "Visual Studio 12 2013 Win64")

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")

+        set(GENERATOR "Visual Studio 12 2013 ARM")

+

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")

+        set(GENERATOR "Visual Studio 14 2015")

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")

+        set(GENERATOR "Visual Studio 14 2015 Win64")

+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140")

+        set(GENERATOR "Visual Studio 14 2015 ARM")

+

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")

+        set(GENERATOR "Visual Studio 15 2017")

+    elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")

+        set(GENERATOR "Visual Studio 15 2017 Win64")

+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")

+        set(GENERATOR "Visual Studio 15 2017 ARM")

+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")

+        set(GENERATOR "Visual Studio 15 2017")

+    else()

+        message(FATAL_ERROR "Unable to determine appropriate generator for: ${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}")

+    endif()

+

+endif()

+

 foreach(BUILDTYPE "rel" "dbg")

 

     message("Building ${TARGET_TRIPLET}-${BUILDTYPE}...")

@@ -81,10 +111,12 @@ foreach(BUILDTYPE "rel" "dbg")
     file(REMOVE_RECURSE ${BUILD_DIR})

     file(MAKE_DIRECTORY ${BUILD_DIR}) 

 

-    if(RELEASE_BUILD)

-        SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})

-    else()

-        SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR}/debug)

+    SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})

+    if(WIN32)

+        SET(OPTIONS ${OPTIONS} -G ${GENERATOR})

+    endif()    

+    if(NOT RELEASE_BUILD)

+        STRING(APPEND FMILIB_INSTALL_PREFIX "/debug")

     endif()

 

     # Step 1: Configure

diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 5689f78bb..8be4a8c33 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp

-Version: 0.4.0

+Version: 0.5.0

 Build-Depends: grpc, gtest, curl, crc32c

 Description: C++ Client Libraries for Google Cloud Platform APIs.

diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch
deleted file mode 100644
index d0e3529c7..000000000
--- a/ports/google-cloud-cpp/include-protobuf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/google/cloud/bigtable/CMakeLists.txt	2018-11-09 10:56:34.029389338 -0500
-+++ a/google/cloud/bigtable/CMakeLists.txt	2018-11-09 10:57:18.461259917 -0500
-@@ -53,6 +53,10 @@
- # Configure the location of proto files, particulary the googleapis protos.
- list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis"
-             "${PROJECT_SOURCE_DIR}")
-+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
-+if(PROTO_INCLUDE_DIR)
-+    list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
-+endif()
- 
- # Include the functions to compile proto files.
- include(CompileProtos)
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 54fa6d483..94e227c4f 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -1,17 +1,13 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.4.0
-    SHA512 2198a7e055c37c2a0d782e2226c2cfb4009e01c36783fe23a0a32b10c7800c1998fbaea17281cb831e7b58975d1bcdb1b2bfec0a5e4fd9d08f25299b96e8893a
+    REF v0.5.0
+    SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
     HEAD_REF master
-    PATCHES include-protobuf.patch
 )
 
 set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97)
@@ -29,7 +25,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=vcpkg
+        -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
         -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
 )
 
diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 7de4cac0e..4b84ecc5f 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -10,7 +10,7 @@ include(vcpkg_common_functions)
 set(LIBICONV_VERSION 1.15)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz"
+    URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz"
     FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz"
     SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
 )
@@ -43,4 +43,4 @@ vcpkg_copy_pdbs()
 file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright)
 
-vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
\ No newline at end of file
+vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch
index 3d155cbe4..57078be15 100644
--- a/ports/openvdb/AddLinkageAndToolsChoice.patch
+++ b/ports/openvdb/AddLinkageAndToolsChoice.patch
@@ -73,7 +73,7 @@ index 5703eb9..6ff3c6a 100644
  SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES}
    PROPERTIES
 -  COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}"
-+  COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj"
++  COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
 -
 +IF ( OPENVDB_STATIC )
@@ -130,7 +130,7 @@ index 5703eb9..6ff3c6a 100644
  SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES}
    PROPERTIES
 -  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}"
-+  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj"
++  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
  
 +IF ( OPENVDB_BUILD_TOOLS )
@@ -142,7 +142,7 @@ index 5703eb9..6ff3c6a 100644
  SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
    PROPERTIES
 -  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}"
-+  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj"
++  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
  ADD_EXECUTABLE ( vdb_render
    ${VDB_RENDER_SOURCE_FILES}
@@ -151,7 +151,7 @@ index 5703eb9..6ff3c6a 100644
  SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES}
    PROPERTIES
 -  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
-+  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 /bigobj"
++  COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$<CXX_COMPILER_ID:MSVC>:/bigobj>"
    )
 -IF (NOT WIN32)
    ADD_EXECUTABLE ( vdb_view
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL
index 22c216b5c..e822bf04c 100644
--- a/ports/openvdb/CONTROL
+++ b/ports/openvdb/CONTROL
@@ -1,5 +1,5 @@
 Source: openvdb
-Version: 5.0.0-1
+Version: 5.0.0-2
 Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
 Description: Sparse volume data structure and tools
 
diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL
index 4777fe8e9..d14b93ded 100644
--- a/ports/uriparser/CONTROL
+++ b/ports/uriparser/CONTROL
@@ -1,3 +1,3 @@
 Source: uriparser
-Version: 0.9.0
+Version: 0.9.1
 Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode
diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake
index 8061a6221..342269c78 100644
--- a/ports/uriparser/portfile.cmake
+++ b/ports/uriparser/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uriparser/uriparser
-    REF uriparser-0.9.0
-    SHA512 d0a317fa55531f75b0e7ec712ea36f8e36a8cf72fdb4f959f3df7cc7c519d09752b194579a4f288bcea56d7be105da3d79dd8323960e74daff93f1dad2b5085d
+    REF uriparser-0.9.1
+    SHA512 5a553bc503b345bd81ad8bcfa25ab1e0f0ea0a0446a0c4beba9129d128d24de418efd10f04f8814b4f8864f6e219b5b9b938934edea76e78c0235428e5062636
     HEAD_REF master
 )
 
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 4bb428668..7a1b2777b 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -123,6 +123,8 @@ fetchTool()
         os="linux"
     elif [ "$UNAME" = "Darwin" ]; then
         os="osx"
+    elif [ "$UNAME" = "FreeBSD" ]; then
+        os="freebsd"
     else
         echo "Unknown uname: $UNAME"
         return 1
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 617fe1a0f..cf3fc7861 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -170,6 +170,8 @@ function(vcpkg_configure_cmake)
         list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/android.cmake")
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
         list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/osx.cmake")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+        list(APPEND _csc_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_ROOT_DIR}/scripts/toolchains/freebsd.cmake")
     endif()
 
     list(APPEND _csc_OPTIONS
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index b6cfc4aab..0c3a9bca2 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -123,6 +123,8 @@ function(vcpkg_find_acquire_program VAR)
       set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
     elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
       set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-osx")
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+      set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd")
     else()
       set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux")
     endif()
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 9378c7832..18ca741c2 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -21,6 +21,13 @@
         <sha512>ee9eded0c72e06ef99554f09553d40842478700ca6f07319c28247f1d45301708c703c65ad617cf618833257bacc3b9f63a54b32288bfb619d38758669dcd20f</sha512>
         <archiveName>cmake-3.12.4-Linux-x86_64.tar.gz</archiveName>
     </tool>
+    <tool name="cmake" os="freebsd">
+        <version>3.12.4</version>
+        <exeRelativePath>cmake-3.12.4-FreeBSD-x86_64/bin/cmake</exeRelativePath>
+        <url>https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz</url>
+        <sha512>b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479</sha512>
+        <archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName>
+    </tool>
     <tool name="git" os="windows">
         <version>2.20.0</version>
         <exeRelativePath>cmd\git.exe</exeRelativePath>
@@ -40,6 +47,12 @@
         <url></url>
         <sha512></sha512>
     </tool>
+    <tool name="git" os="freebsd">
+        <version>2.7.4</version>
+        <exeRelativePath></exeRelativePath>
+        <url></url>
+        <sha512></sha512>
+    </tool>
     <tool name="vswhere" os="windows">
         <version>2.4.1</version>
         <exeRelativePath>vswhere.exe</exeRelativePath>
@@ -94,4 +107,11 @@
         <sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512>
         <archiveName>ninja-mac-1.8.2.zip</archiveName>
     </tool>
+    <tool name="ninja" os="freebsd">
+        <version>1.8.2</version>
+        <exeRelativePath>ninja</exeRelativePath>
+        <url>https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip</url>
+        <sha512>56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86</sha512>
+        <archiveName>ninja-freebsd-1.8.2.zip</archiveName>
+    </tool>
 </tools>
diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp
index 2a73dba89..c34f30974 100644
--- a/toolsrc/src/vcpkg/metrics.cpp
+++ b/toolsrc/src/vcpkg/metrics.cpp
@@ -220,6 +220,8 @@ namespace vcpkg::Metrics
                                    "OSX",
 #elif defined(__linux__)
                                    "Linux",
+#elif defined(__FreeBSD__)
+                                   "FreeBSD",
 #elif defined(__unix__)
                                    "Unix",
 #else
diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp
index 365271872..b713b2752 100644
--- a/toolsrc/src/vcpkg/tools.cpp
+++ b/toolsrc/src/vcpkg/tools.cpp
@@ -52,11 +52,13 @@ namespace vcpkg
         static constexpr StringLiteral OS_STRING = "osx";
 #elif defined(__linux__)
         static constexpr StringLiteral OS_STRING = "linux";
+#elif defined(__FreeBSD__)
+        static constexpr StringLiteral OS_STRING = "freebsd";
 #else
         return std::string("operating system is unknown");
 #endif
 
-#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
+#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
         static const std::string XML_VERSION = "2";
         static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml";
         static const std::regex XML_VERSION_REGEX {R"###(<tools[\s]+version="([^"]+)">)###"};