diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt
index b4b8a646d..d98914e60 100644
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@@ -62,6 +62,7 @@ add_sublibrary(algorithm)
add_sublibrary(base)
add_sublibrary(container)
add_sublibrary(debugging)
+add_sublibrary(hash)
add_sublibrary(memory)
add_sublibrary(meta)
add_sublibrary(numeric)
@@ -75,6 +76,7 @@ add_sublibrary(utility)
target_link_public_libraries(algorithm base meta)
target_link_public_libraries(container algorithm base memory)
target_link_public_libraries(debugging base)
+target_link_public_libraries(hash base)
target_link_public_libraries(memory meta)
target_link_public_libraries(meta base)
target_link_public_libraries(numeric base)
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index f616b8608..95191fcf0 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,5 +1,5 @@
Source: abseil
-Version: 2018-11-08
+Version: 2018-11-08-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.
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 8323188d9..ed08a12c2 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,3 +1,3 @@
Source: ace
-Version: 6.5.2
+Version: 6.5.3
Description: The ADAPTIVE Communication Environment
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 3f5df8868..e10e82e0e 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -9,9 +9,9 @@ endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_2/ACE.zip"
- FILENAME "ACE-6.5.2.zip"
- SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98
+ URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip"
+ FILENAME ACE-6.5.3.zip
+ SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d
)
vcpkg_extract_source_archive(${ARCHIVE})
diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL
new file mode 100644
index 000000000..4abf5457f
--- /dev/null
+++ b/ports/cpp-taskflow/CONTROL
@@ -0,0 +1,3 @@
+Source: cpp-taskflow
+Version: 2018-11-30
+Description: Fast Parallel Tasking Programming Library using Modern C++.
diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake
new file mode 100644
index 000000000..1f596f0d4
--- /dev/null
+++ b/ports/cpp-taskflow/portfile.cmake
@@ -0,0 +1,29 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO cpp-taskflow/cpp-taskflow
+ REF 97252f7d782c6e896122645175c08131ce10e649
+ SHA512 df8ae9ea449663cb548f3c37346c2e0c785add2d86b9c618aea2741d81fe88c34b0d3d0e610a4b571973f9bc18631becedfe28e029ecf0c0cc87e4c35a280a29
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DTF_BUILD_EXAMPLES=OFF
+ -DTF_BUILD_TESTS=OFF
+ -DTF_BUILD_BENCHMARKS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-taskflow/copyright COPYONLY)
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 800d54d42..e5da66ef7 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,10 +1,18 @@
Source: cpprestsdk
-Version: 2.10.6-3
+Version: 2.10.7
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.
-Default-Features: websockets
+Default-Features: default-features
+
+Feature: default-features
+Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[websockets]
+Description: Features installed by default
Feature: websockets
Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp)
Description: Websockets support
+
+Feature: brotli
+Build-Depends: brotli
+Description: Brotli compression support
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index c94b01b80..d6390836c 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/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.6
- SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd
+ REF v2.10.8
+ SHA512 d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df
HEAD_REF master
)
@@ -21,6 +21,11 @@ if("websockets" IN_LIST FEATURES)
set(CPPREST_EXCLUDE_WEBSOCKETS OFF)
endif()
+set(CPPREST_EXCLUDE_BROTLI ON)
+if ("brotli" IN_LIST FEATURES)
+ set(CPPREST_EXCLUDE_BROTLI OFF)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Release
PREFER_NINJA
@@ -37,18 +42,11 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
-else()
- vcpkg_fixup_cmake_targets() # v2.10.6 and below
-endif()
-
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
file(INSTALL
${SOURCE_PATH}/license.txt
DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpprestsdk RENAME copyright)
vcpkg_copy_pdbs()
-
diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL
new file mode 100644
index 000000000..3351ecf25
--- /dev/null
+++ b/ports/ctre/CONTROL
@@ -0,0 +1,3 @@
+Source: ctre
+Version: 2.2-1
+Description: A Compile time PCRE (almost) compatible regular expression matcher
diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake
new file mode 100644
index 000000000..76a4a7857
--- /dev/null
+++ b/ports/ctre/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO hanickadot/compile-time-regular-expressions
+ REF v2.2
+ SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703
+ HEAD_REF master
+)
+
+# Install header files
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctre RENAME copyright)
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index 95040eba1..f76c99124 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,9 +1,8 @@
Source: curl
-Version: 7.61.1-1
+Version: 7.61.1-2
Build-Depends: zlib
Description: A library for transferring data with URLs
Default-Features: ssl
-# For WINSSL add set(CURL_USE_WINSSL ON) to your triplet file
Feature: tool
Description: Builds curl executable
@@ -16,9 +15,21 @@ Build-Depends: nghttp2, curl[ssl]
Description: HTTP2 support
Feature: ssl
-Build-Depends: openssl
-Description: SSL support
+Build-Depends: curl[openssl] (!windows), curl[winssl] (windows)
+Description: Default SSL backend
Feature: ssh
Build-Depends: libssh2, curl[non-http]
Description: SSH support via libssh2
+
+# SSL backends
+Feature: openssl
+Build-Depends: openssl
+Description: SSL support (OpenSSL)
+
+Feature: winssl
+Description: SSL support (Secure Channel / "WinSSL")
+
+Feature: mbedtls
+Build-Depends: mbedtls
+Description: SSL support (mbedTLS)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 0b156c4d0..534a54aea 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -7,15 +7,15 @@ vcpkg_from_github(
SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c
HEAD_REF master
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
- ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
- ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch
- ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch
+ 0001_cmake.patch
+ 0002_fix_uwp.patch
+ 0003_fix_libraries.patch
+ 0004_nghttp2_staticlib.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
-# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
+# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
set(HTTP2_OPTIONS)
if("http2" IN_LIST FEATURES)
set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON)
@@ -23,13 +23,21 @@ endif()
# SSL
set(USE_OPENSSL OFF)
+if("openssl" IN_LIST FEATURES)
+ set(USE_OPENSSL ON)
+endif()
+
set(USE_WINSSL OFF)
-if("ssl" IN_LIST FEATURES)
- if(CURL_USE_WINSSL)
- set(USE_WINSSL ON)
- else()
- set(USE_OPENSSL ON)
+if("winssl" IN_LIST FEATURES)
+ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ message(FATAL_ERROR "winssl is not supported on non-Windows platforms")
endif()
+ set(USE_WINSSL ON)
+endif()
+
+set(USE_MBEDTLS OFF)
+if("mbedtls" IN_LIST FEATURES)
+ set(USE_MBEDTLS ON)
endif()
# SSH
@@ -64,7 +72,7 @@ endif()
vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${PERL_PATH}")
+vcpkg_add_to_path(${PERL_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@@ -78,6 +86,7 @@ vcpkg_configure_cmake(
-DCURL_STATICLIB=${CURL_STATICLIB}
-DCMAKE_USE_OPENSSL=${USE_OPENSSL}
-DCMAKE_USE_WINSSL=${USE_WINSSL}
+ -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS}
-DCMAKE_USE_LIBSSH2=${USE_LIBSSH2}
-DHTTP_ONLY=${USE_HTTP_ONLY}
OPTIONS_RELEASE
diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL
index fada181ac..c96e1b0b8 100644
--- a/ports/ecsutil/CONTROL
+++ b/ports/ecsutil/CONTROL
@@ -1,4 +1,4 @@
Source: ecsutil
-Version: 1.0.1.2-1
+Version: 1.0.1.4
Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
Build-Depends: atlmfc
diff --git a/ports/ecsutil/NoLibSyms.patch b/ports/ecsutil/NoLibSyms.patch
new file mode 100644
index 000000000..e4f7e77bd
--- /dev/null
+++ b/ports/ecsutil/NoLibSyms.patch
@@ -0,0 +1,41 @@
+ ECSUtil/ECSUtil.vcxproj | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj
+index 05c5726..4b5de57 100644
+--- a/ECSUtil/ECSUtil.vcxproj
++++ b/ECSUtil/ECSUtil.vcxproj
+@@ -289,7 +289,7 @@
+ true
+ false
+ false
+- ProgramDatabase
++ None
+
+
+ Windows
+@@ -317,7 +317,7 @@
+ true
+ false
+ false
+- ProgramDatabase
++ None
+
+
+ Windows
+@@ -462,6 +462,7 @@
+ true
+ false
+ false
++ None
+
+
+ Windows
+@@ -493,6 +494,7 @@
+ true
+ false
+ false
++ None
+
+
+ Windows
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake
index 4a8e48b2b..0dc5fa8fa 100644
--- a/ports/ecsutil/portfile.cmake
+++ b/ports/ecsutil/portfile.cmake
@@ -28,10 +28,10 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO EMCECS/ecs-object-client-windows-cpp
- REF v1.0.1.2
- SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f
+ REF v1.0.1.4
+ SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a
HEAD_REF master
- PATCHES disable-setversion.patch
+ PATCHES NoLibSyms.patch
)
vcpkg_install_msbuild(
@@ -44,6 +44,10 @@ vcpkg_install_msbuild(
DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG}
)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll)
diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL
index 0a8d83aee..b090f2ba5 100644
--- a/ports/gflags/CONTROL
+++ b/ports/gflags/CONTROL
@@ -1,3 +1,3 @@
Source: gflags
-Version: 2.2.1-3
+Version: 2.2.2-1
Description: A C++ library that implements commandline flags processing
diff --git a/ports/gflags/fix_cmake_config.patch b/ports/gflags/fix_cmake_config.patch
new file mode 100644
index 000000000..bea561ecb
--- /dev/null
+++ b/ports/gflags/fix_cmake_config.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
+index a512c2a..e7f50d0 100644
+--- a/cmake/config.cmake.in
++++ b/cmake/config.cmake.in
+@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS)
+ else ()
+ set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+ endif ()
+- elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
++ elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
+ set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
+ else ()
+ set (@PACKAGE_PREFIX@_NOTHREADS TRUE)
diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake
index 31ffeafa5..87053f849 100644
--- a/ports/gflags/portfile.cmake
+++ b/ports/gflags/portfile.cmake
@@ -7,15 +7,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gflags/gflags
- REF v2.2.1
- SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
+ REF v2.2.2
+ SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
HEAD_REF master
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+ 0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
+ fix_cmake_config.patch
)
vcpkg_configure_cmake(
diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL
new file mode 100644
index 000000000..d1a70f0d5
--- /dev/null
+++ b/ports/libui/CONTROL
@@ -0,0 +1,3 @@
+Source: libui
+Version: 2018-11-03
+Description: Simple and portable (but not inflexible) native GUI library in C.
diff --git a/ports/libui/fix-cmake.patch b/ports/libui/fix-cmake.patch
new file mode 100644
index 000000000..3d206584b
--- /dev/null
+++ b/ports/libui/fix-cmake.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c7193fbb..50c997f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,8 +152,7 @@ add_subdirectory("common")
+ add_subdirectory("${_OSNAME}")
+ add_library(libui ${_LIBUI_SOURCES})
+ target_include_directories(libui
+- PUBLIC .
+- PRIVATE ${_LIBUI_INCLUEDIRS})
++ PUBLIC $)
+ target_compile_definitions(libui
+ PRIVATE ${_LIBUI_DEFS})
+ # cmake produces this for us by default but only for shared libraries
+@@ -229,10 +228,30 @@ macro(_add_exec _name)
+ # TODOfor some reason these don't propagate
+ if(NOT WIN32)
+ target_include_directories(${_name}
+- PUBLIC .)
++ PUBLIC $)
+ target_compile_options(${_name}
+ PUBLIC ${_COMMON_CFLAGS})
+ endif()
+ endmacro()
+ add_subdirectory("test")
+ add_subdirectory("examples")
++
++if(BUILD_SHARED_LIBS)
++ install(TARGETS ${PROJECT_NAME}
++ EXPORT ${PROJECT_NAME}-config
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++else()
++ install(TARGETS ${PROJECT_NAME}
++ EXPORT ${PROJECT_NAME}-config
++ DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
++
++install(EXPORT ${PROJECT_NAME}-config
++ FILE unofficial-${PROJECT_NAME}-config.cmake
++ NAMESPACE unofficial::libui::
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++)
++
++install(FILES ui.h DESTINATION include)
diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
new file mode 100644
index 000000000..4f543a89b
--- /dev/null
+++ b/ports/libui/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO andlabs/libui
+ REF 7138276ccfbde94873cb6e2db65642adcbd2ee19
+ SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45
+ HEAD_REF master
+ PATCHES
+ fix-cmake.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libui/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL
index eb070c132..d68720137 100644
--- a/ports/nghttp2/CONTROL
+++ b/ports/nghttp2/CONTROL
@@ -1,3 +1,3 @@
Source: nghttp2
-Version: 1.34.0
+Version: 1.35.0
Description: Implementation of the Hypertext Transfer Protocol version 2 in C
diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake
index cf80ecd66..52f754afb 100644
--- a/ports/nghttp2/portfile.cmake
+++ b/ports/nghttp2/portfile.cmake
@@ -1,7 +1,7 @@
include(vcpkg_common_functions)
set(LIB_NAME nghttp2)
-set(LIB_VERSION 1.34.0)
+set(LIB_VERSION 1.35.0)
set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
- SHA512 f027f8e043c58710ff34a65c705c0a76d91ffbf20f684606dbbbecc10f0e1fbc98a41047b8df5061af0bda6e8f89a9587e33c6549181f9317c4d3336e4a8b62e
+ SHA512 65889545684e2c8b4aeeb7084ca36e3f78927fa2b6d1df906af3970d8ce6c7c6093b56a5e0713f7bb54a98f06ad52d6e2b323e760297610702afe526b0fdd577
)
vcpkg_extract_source_archive(${ARCHIVE})
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL
index 09afae49c..076c71211 100644
--- a/ports/range-v3/CONTROL
+++ b/ports/range-v3/CONTROL
@@ -1,3 +1,3 @@
Source: range-v3
-Version: 0.4.0-20181122
+Version: 0.4.0-20181129
Description: Range library for C++11/14/17.
diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake
index cbdf04227..f7577c9bb 100644
--- a/ports/range-v3/portfile.cmake
+++ b/ports/range-v3/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ericniebler/range-v3
- REF 00d4676502aa257a3ce934b50555211b4791ae05
- SHA512 a0067e1b0d1d2261c2f868ebc57278b74a081ccc00dcd65648b5c362317c6cd3321fb3b9936733d839cd9d48cf801d1f23710bce9e33edd9dfa8f32556d90526
+ REF cf8add9f467aac695b9fa38e168b90df36b1a806
+ SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2
HEAD_REF master
)