[vcpkg] update CMake to 3.27.1 (#31931)

* update cmake

* update to rc2

* use nightly build

* update to rc3 drop freebsd due to dead link and update git while i am at it

* fix missing sha

* fix relative path

* update to 3.27 release

* [paho-mqtt] remove usage of OPENSSL_ROOT_DIR

* [directxtex] control optional directx-headers dep

* v db

* IN LIST -> IN_LIST

* v db

* try fixing azure-storage-cpp

* v db

* update to 3.27.1
This commit is contained in:
Alexander Neumann 2023-07-31 22:03:54 +02:00 committed by GitHub
parent 7d677e1fb0
commit 6ced774037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 47 additions and 29 deletions

View File

@ -8,6 +8,8 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
vcpkg_replace_string("${SOURCE_PATH}/Microsoft.WindowsAzure.Storage/CMakeLists.txt" [[file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)]] "")
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage" SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage"
OPTIONS OPTIONS

View File

@ -1,7 +1,7 @@
{ {
"name": "azure-storage-cpp", "name": "azure-storage-cpp",
"version": "7.5.0", "version": "7.5.0",
"port-version": 5, "port-version": 6,
"description": [ "description": [
"[legacy] Microsoft Azure Storage Client SDK for C++", "[legacy] Microsoft Azure Storage Client SDK for C++",
"A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client."

View File

@ -20,6 +20,10 @@ vcpkg_check_features(
tools BUILD_TOOLS tools BUILD_TOOLS
) )
if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE")
endif()
if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES)) if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES))
message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.")
endif() endif()

View File

@ -1,6 +1,7 @@
{ {
"name": "directxtex", "name": "directxtex",
"version-date": "2023-06-13", "version-date": "2023-06-13",
"port-version": 1,
"description": "DirectXTex texture processing library", "description": "DirectXTex texture processing library",
"homepage": "https://github.com/Microsoft/DirectXTex", "homepage": "https://github.com/Microsoft/DirectXTex",
"documentation": "https://github.com/microsoft/DirectXTex/wiki", "documentation": "https://github.com/microsoft/DirectXTex/wiki",

View File

@ -12,6 +12,8 @@ vcpkg_from_github(
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC)
vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" [[SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")]] "")
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS

View File

@ -1,6 +1,7 @@
{ {
"name": "paho-mqtt", "name": "paho-mqtt",
"version": "1.3.12", "version": "1.3.12",
"port-version": 1,
"description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things",
"homepage": "https://github.com/eclipse/paho.mqtt.c", "homepage": "https://github.com/eclipse/paho.mqtt.c",
"license": "EPL-2.0", "license": "EPL-2.0",

View File

@ -15,39 +15,32 @@
<archiveName>python-3.10.7.nupkg.zip</archiveName> <archiveName>python-3.10.7.nupkg.zip</archiveName>
</tool> </tool>
<tool name="cmake" os="windows"> <tool name="cmake" os="windows">
<version>3.25.1</version> <version>3.27.1</version>
<exeRelativePath>cmake-3.25.1-windows-i386\bin\cmake.exe</exeRelativePath> <exeRelativePath>cmake-3.27.1-windows-i386/bin/cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip</url> <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip</url>
<sha512>4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc</sha512> <sha512>a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0</sha512>
<archiveName>cmake-3.25.1-windows-i386.zip</archiveName> <archiveName>cmake-3.27.1-windows-i386.zip</archiveName>
</tool> </tool>
<tool name="cmake" os="osx"> <tool name="cmake" os="osx">
<version>3.25.1</version> <version>3.27.1</version>
<exeRelativePath>cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath> <exeRelativePath>cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz</url> <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz</url>
<sha512>6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a</sha512> <sha512>78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7</sha512>
<archiveName>cmake-3.25.1-macos-universal.tar.gz</archiveName> <archiveName>cmake-3.27.1-macos-universal.tar.gz</archiveName>
</tool> </tool>
<tool name="cmake" os="linux"> <tool name="cmake" os="linux">
<version>3.25.1</version> <version>3.27.1</version>
<exeRelativePath>cmake-3.25.1-linux-x86_64/bin/cmake</exeRelativePath> <exeRelativePath>cmake-3.27.1-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz</url> <url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz</url>
<sha512>df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78</sha512> <sha512>192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1</sha512>
<archiveName>cmake-3.25.1-linux-x86_64.tar.gz</archiveName> <archiveName>cmake-3.27.1-linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.20.4</version>
<exeRelativePath>usr/local/bin/cmake</exeRelativePath>
<url>https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz</url>
<sha512>3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475</sha512>
<archiveName>cmake-3.20.4.txz</archiveName>
</tool> </tool>
<tool name="git" os="windows"> <tool name="git" os="windows">
<version>2.7.4</version> <version>2.7.4</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath> <exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe</url> <url>https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-32-bit.7z.exe</url>
<sha512>f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f</sha512> <sha512>e483a890e77b427c20785e7528279338c7d99651e0afbf704bf2ff3cde23d0895c07e961603d133d5d78aea2308a2994e532974de41674e4f334423b1b47bd0e</sha512>
<archiveName>PortableGit-2.35.1.2-32-bit.7z.exe</archiveName> <archiveName>PortableGit-2.41.0-32-bit.7z.exe</archiveName>
</tool> </tool>
<tool name="git" os="linux"> <tool name="git" os="linux">
<version>2.7.4</version> <version>2.7.4</version>

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "38122f7f0972f1c4d6b01b776f9c1edf81e5dfd0",
"version": "7.5.0",
"port-version": 6
},
{ {
"git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3", "git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3",
"version": "7.5.0", "version": "7.5.0",

View File

@ -462,7 +462,7 @@
}, },
"azure-storage-cpp": { "azure-storage-cpp": {
"baseline": "7.5.0", "baseline": "7.5.0",
"port-version": 5 "port-version": 6
}, },
"azure-storage-files-datalake-cpp": { "azure-storage-files-datalake-cpp": {
"baseline": "12.7.0", "baseline": "12.7.0",
@ -2130,7 +2130,7 @@
}, },
"directxtex": { "directxtex": {
"baseline": "2023-06-13", "baseline": "2023-06-13",
"port-version": 0 "port-version": 1
}, },
"directxtk": { "directxtk": {
"baseline": "2023-06-13", "baseline": "2023-06-13",
@ -6190,7 +6190,7 @@
}, },
"paho-mqtt": { "paho-mqtt": {
"baseline": "1.3.12", "baseline": "1.3.12",
"port-version": 0 "port-version": 1
}, },
"paho-mqttpp3": { "paho-mqttpp3": {
"baseline": "1.2.0", "baseline": "1.2.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281",
"version-date": "2023-06-13",
"port-version": 1
},
{ {
"git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3", "git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3",
"version-date": "2023-06-13", "version-date": "2023-06-13",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd",
"version": "1.3.12",
"port-version": 1
},
{ {
"git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a", "git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a",
"version": "1.3.12", "version": "1.3.12",