Merge pull request #1179 from microsoft/master

Merge from microsoft/vcpkg
Jimmy-Hu · Oct 28, 2022 · d68d258 · d68d258
2 parents 4ce9ccf + 2de7f38
commit d68d258
Show file tree

Hide file tree

Showing 45 changed files with 245 additions and 145 deletions.
diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nats-io/nats.c
-    REF 8c36c16a9d086738512c9e55157481f8ce46be7c #v3.3.0
-    SHA512 5540916cadadb1e0e84be111fe69b88b5f953cacea6d05d3030f8f11b67865c18e5ef7739303def67e7c57b1032656ab78675f2c6e2ecacf058900575278b5eb
+    REF b26143da7566e816db66e86f6336ebf5c226c4ad #v3.4.1
+    SHA512 6422d3d5b59a700ac56730870dab1bbdadd8f85c9a0cef2c685cdd36189b1689d04d5a710500fbc5299445ca32df9434b404fae3018e8266c284aa34259f110a
     HEAD_REF master
 )
 

diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cnats",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "A C client for the NATS messaging system",
   "homepage": "https://github.com/nats-io/nats.c",
   "license": "Apache-2.0",

diff --git a/ports/cppcoro/portfile.cmake b/ports/cppcoro/portfile.cmake
@@ -7,30 +7,29 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO            lewissbaker/cppcoro
-    REF             92892f31d0c41b8e34e6292d7c9d99228da5c501
-    SHA512          d1997b7449f1c5c0790575d0755ffbb5f9eef13a7610f3ec666a585bdbb93bb1553f79214c1023a1ef23aaeef64078ca6ee3784107645d7a75c7bba943c10b84
+    REF             391215262bd40d68ac6534810164131f5f9eb148 #2022-10-25
+    SHA512          22372a0385d6628e81d44cb3096186f7f79f53dff7786815546bfe6d8e1f5af4eae769c6b23e7d18aa123105418780d022239ebd48d25237fe6face9b74e42e8
     HEAD_REF        master
 )
 
-file(COPY           ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
-     DESTINATION    ${SOURCE_PATH}
+file(COPY           "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+     DESTINATION    "${SOURCE_PATH}"
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=False
 )
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
-file(INSTALL     ${SOURCE_PATH}/LICENSE.txt
-     DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+file(INSTALL     "${SOURCE_PATH}/LICENSE.txt"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
      RENAME      copyright
 )
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/cppcoro/vcpkg.json b/ports/cppcoro/vcpkg.json
@@ -1,8 +1,18 @@
 {
   "name": "cppcoro",
-  "version-date": "2020-02-28",
-  "port-version": 3,
+  "version-date": "2022-10-25",
   "description": "A library of C++ coroutine abstractions for the Coroutines TS",
   "homepage": "https://github.com/lewissbaker/cppcoro",
-  "supports": "!uwp"
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO beached/header_libraries
-    REF d32ba610088041429d48b4f3398f8d1eb84cfe58 #v2.68.1
-    SHA512 4d25b5d83401ea36ea4b987ee7530824d3599a36fd8ca8b0bb4ff7560854550eb267414d762770f8b30179178d5d2758060eedd6534913088a5c220f0d14915d
+    REF d639561ff10faef04eee88a972213e611be9839e #v2.72.1
+    SHA512 ebefddb9566bfa9764ac7b6d5bf5ec6f8ed469297f7f5c600a235ded7dd71c0c3850fd4b3a3b1b0feb79635f8aa8f06d096b75e0aa2cb22446db4b5539127500
     HEAD_REF master
 )
 

diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daw-header-libraries",
-  "version": "2.68.1",
+  "version": "2.72.1",
   "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.",
   "homepage": "https://github.com/beached/header_libraries",
   "license": "BSL-1.0",

diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO beached/daw_json_link
-    REF 6275cd9dadfed96e1b21e552657680ea9fce24cb  #v3.0.4
-    SHA512 7ba326480047b1cfc3cf40114d2793e368d5bc8e90a4e690f17fbac1066e6a89b2c031bef19abab9199b83314dff327651b67f73654e306b17b070b85c50a0f6
+    REF f324fbfe2b563b11ca58c12743bfce4672990e5b  #v3.1.1
+    SHA512 01873ad03772922d588839667a0e82e4d47f82662b8901b252b8ddf7b368d22f2d09f67eecacfdab9bbdf9a3af4494ba0d3b72aacdcf7efd043e3970e0f1ba4d
     HEAD_REF master
 )
 

diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daw-json-link",
-  "version": "3.0.4",
+  "version": "3.1.1",
   "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.",
   "homepage": "https://github.com/beached/daw_json_link",
   "license": "BSL-1.0",

diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
@@ -29,4 +29,6 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gif")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/giflib/usage b/ports/giflib/usage
@@ -0,0 +1,4 @@
+The package giflib is compatible with built-in CMake targets:
+
+    find_package(GIF REQUIRED)
+    target_link_libraries(main PRIVATE GIF::GIF)
diff --git a/ports/giflib/vcpkg-cmake-wrapper.cmake b/ports/giflib/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,25 @@
+find_path(GIF_INCLUDE_DIR NAMES gif_lib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
+find_library(GIF_LIBRARY_RELEASE NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+find_library(GIF_LIBRARY_DEBUG   NAMES gif PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+include(SelectLibraryConfigurations)
+select_library_configurations(GIF)
+set(GIF_LIBRARY "${GIF_LIBRARY}" CACHE STRING "")
+unset(GIF_LIBRARY)
+unset(GIF_FOUND)
+if(NOT TARGET GIF::GIF)
+    add_library(GIF::GIF UNKNOWN IMPORTED)
+    set_target_properties(GIF::GIF PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GIF_INCLUDE_DIR}"
+        IMPORTED_CONFIGURATIONS RELEASE
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION_RELEASE "${GIF_LIBRARY_RELEASE}"
+    )
+    if("${GIF_LIBRARY_DEBUG}")
+        set_property(TARGET GIF::GIF APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(GIF::GIF PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+            IMPORTED_LOCATION_DEBUG "${GIF_LIBRARY_DEBUG}")
+    endif()
+endif()
+_find_package(${ARGS})
diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "giflib",
   "version": "5.2.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A library for reading and writing gif images.",
   "homepage": "https://sourceforge.net/projects/giflib/",
   "license": "MIT",

diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
@@ -11,21 +11,21 @@ vcpkg_from_github(
         0004_fix-config-expected-paths.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
-        -DOPTION_BUILD_GPU_TESTS=OFF
         -DOPTION_BUILD_TOOLS=OFF
         -DOPTION_BUILD_EXAMPLES=OFF
         -DGIT_REV=0
         -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
         -DOPTION_BUILD_EXAMPLES=OFF
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_cpplocate
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
 ## _IMPORT_PREFIX needs to go up one extra level in the directory tree.
@@ -48,12 +48,12 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Remove files already published by egl-registry
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR")
 
 # Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
-configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "glbinding",
-  "version-string": "3.1.0",
-  "port-version": 3,
+  "version": "3.1.0",
+  "port-version": 4,
   "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API",
   "homepage": "https://github.com/cginternals/glbinding",
+  "license": "MIT",
   "dependencies": [
-    "egl-registry"
+    "egl-registry",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
@@ -30,16 +30,16 @@ endif()
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO arvidn/libtorrent
-        REF 722d78250a30c89c92970a78be970269a395be36 # v2.0.7
-        SHA512 69c7e6c02db6ff6b10d94b52470eda38839b4121960f7d19c3829eb453a84a62f017e1607bbb8dd63528c1461686fa6f30af605a046faae2c9c916aa688b555f
+        REF 64817e0e8793d0875fc10245de52ffb2540a223d # v2.0.8
+        SHA512 607172e6a806d78bb34443101bd384ac7a42e0edc3e7c4a2cf5c3ab5f2be64f84557726dce16c2fbaaa2ba254529a8871b3123b0e79fe87cd5bf26021ecb59da
         HEAD_REF RC_2_0
 )
 
 vcpkg_from_github(
         OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH
         REPO arvidn/try_signal
-        REF 751a7e5a5be14892bcfdff1e63c653bcbf71cf39
-        SHA512 4ccea4f67a79acf49a9943d8aec3999475357d7ad3cfc7b37f0e1c4527f8f4536993c6f6241bb3eb166a1dc939133a4f3b35197f9e47fb2ac9c713b64f8cb96d
+        REF 105cce59972f925a33aa6b1c3109e4cd3caf583d #2022-10-27
+        SHA512 4a0090755831e0e4a1930817345fa5934144421d9a9d710fe8ed3712233fa2fa037fc0e0d4f88b7cc8fb1bc05fe2d55372af1ff47d6fbf5208e03f45f2a424e4
         HEAD_REF master
 )
 
@@ -54,8 +54,8 @@ vcpkg_from_github(
 vcpkg_from_github(
         OUT_SOURCE_PATH LIB_SIMULATOR_SOURCE_PATH
         REPO arvidn/libsimulator
-        REF 64fb5b4fde1879abc09c018604d57e485a12e999
-        SHA512 20b57eb436127028339528f34a9db7e7149d2c5d86149114444205370482d3f5284e76493f2fbc1c6904175e6482671bfcaeb98d0bee7d399e546abef02f32f3
+        REF 39144efe83fcd38778cf76fc609e3475694642ca #2022-10-27
+        SHA512 a021f769d52d127355ecaceaf912bf3e86aaa256d4768d270fbe6066793b6159eddecd0262f3f2158602f883d49b3aac39eb79be5399212cdd7711f921ffa15a
         HEAD_REF master
 )
 

diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libtorrent",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "maintainers": "Arvid Norberg <arvid.norberg@gmail.com>",
   "description": "An efficient feature complete C++ BitTorrent implementation",
   "homepage": "https://libtorrent.org",

diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aspnet/SignalR-Client-Cpp
-    REF v0.1.0-alpha3
-    SHA512 7dbd75748535c7b7fef36afe246b132b243b8b4932c218a63aa18c7a44d6691c002144c6d2f5603ad63c03d018907436ad259fdfcc0d7749917931bdebef670b
+    REF v0.1.0-alpha4
+    SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456
     HEAD_REF main
 )
 

diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "microsoft-signalr",
-  "version-string": "0.1.0-alpha3",
+  "version": "0.1.0-alpha4",
   "port-version": 1,
   "description": "C++ Client for ASP.NET Core SignalR.",
   "homepage": "https://github.com/aspnet/SignalR-Client-Cpp",
@@ -23,6 +23,7 @@
     "default-features": {
       "description": "Features installed by default",
       "dependencies": [
+        "jsoncpp",
         {
           "name": "microsoft-signalr",
           "features": [

diff --git a/ports/plib/portfile.cmake b/ports/plib/portfile.cmake
@@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json
@@ -1,6 +1,14 @@
 {
   "name": "plib",
-  "version-string": "1.8.5",
-  "port-version": 5,
-  "description": "A suite of portable game libraries"
+  "version": "1.8.5",
+  "port-version": 6,
+  "description": "A suite of portable game libraries",
+  "license": "LGPL-2.0-only",
+  "supports": "!osx & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO lballabio/QuantLib
-    REF QuantLib-v1.27
-    SHA512 c763e7083e1e832d39adb507cc6b34b1ad0a0b7f2b7ffe390428f93fb1df84fcbbf43bcb31dd2f2381da2ac563c88a10fbd932ea5155bd43c604025960039b58
+    REF QuantLib-v1.28
+    SHA512 720bc18e5a01367e5cea5c9a28f2103357e6d2708dbc13c208a73b52bc615ba03ab248eca75f94e9c7631e340faa87a18bef94b4ae9f277006fc62fac4b30bc4
     HEAD_REF master
 )
 

diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "quantlib",
-  "version": "1.27",
+  "version": "1.28",
   "description": "The QuantLib C++ library",
   "homepage": "https://www.quantlib.org/",
   "license": "BSD-3-Clause",

diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO odygrd/quill
-    REF v2.2.0
-    SHA512 cf9ef0f45f6afad38aebcfb7884dc52207d09416cc42c01710b6bbb9ade9ff1cb0d58d7dd8b09a9e08457fbeeddcccb73a75316c1c80dc4241652b2b7786ebb6
+    REF v2.3.0
+    SHA512 6f3e905ea04adcf2d93e51b2065749523bc5a5c47400273c7f21049c6178d4e74e6541d8785bd1e5f81b7eafda301a5ebf8f19c989ca296c31a4568435364457
     HEAD_REF master
 )
 

diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "C++14 Asynchronous Low Latency Logging Library",
   "homepage": "https://github.com/odygrd/quill/",
   "license": "MIT",