From 6ced77403708cb188c43172c95b7d829c4518862 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 31 Jul 2023 22:03:54 +0200 Subject: [PATCH] [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 --- ports/azure-storage-cpp/portfile.cmake | 2 ++ ports/azure-storage-cpp/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 4 +++ ports/directxtex/vcpkg.json | 1 + ports/paho-mqtt/portfile.cmake | 2 ++ ports/paho-mqtt/vcpkg.json | 1 + scripts/vcpkgTools.xml | 43 +++++++++++--------------- versions/a-/azure-storage-cpp.json | 5 +++ versions/baseline.json | 6 ++-- versions/d-/directxtex.json | 5 +++ versions/p-/paho-mqtt.json | 5 +++ 11 files changed, 47 insertions(+), 29 deletions(-) diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index ba9154d86b..ffde123979 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( 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( SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage" OPTIONS diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json index 4b5f614134..fad1ab7270 100644 --- a/ports/azure-storage-cpp/vcpkg.json +++ b/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", "version": "7.5.0", - "port-version": 5, + "port-version": 6, "description": [ "[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." diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 9814f86d84..6152c23457 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_check_features( 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)) message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") endif() diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index ebdee6720a..ce4716ff84 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtex", "version-date": "2023-06-13", + "port-version": 1, "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 55039855ce..2bb84bd7d6 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) 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( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index ff004a0e77..76c5ed3104 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "paho-mqtt", "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", "homepage": "https://github.com/eclipse/paho.mqtt.c", "license": "EPL-2.0", diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 831c9be01c..55b1956095 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,39 +15,32 @@ python-3.10.7.nupkg.zip - 3.25.1 - cmake-3.25.1-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip - 4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc - cmake-3.25.1-windows-i386.zip + 3.27.1 + cmake-3.27.1-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip + a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0 + cmake-3.27.1-windows-i386.zip - 3.25.1 - cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz - 6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a - cmake-3.25.1-macos-universal.tar.gz + 3.27.1 + cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz + 78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7 + cmake-3.27.1-macos-universal.tar.gz - 3.25.1 - cmake-3.25.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz - df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78 - cmake-3.25.1-linux-x86_64.tar.gz - - - 3.20.4 - usr/local/bin/cmake - https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz - 3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475 - cmake-3.20.4.txz + 3.27.1 + cmake-3.27.1-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz + 192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1 + cmake-3.27.1-linux-x86_64.tar.gz 2.7.4 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe - f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f - PortableGit-2.35.1.2-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-32-bit.7z.exe + e483a890e77b427c20785e7528279338c7d99651e0afbf704bf2ff3cde23d0895c07e961603d133d5d78aea2308a2994e532974de41674e4f334423b1b47bd0e + PortableGit-2.41.0-32-bit.7z.exe 2.7.4 diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index ac883c9fcd..299717df10 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38122f7f0972f1c4d6b01b776f9c1edf81e5dfd0", + "version": "7.5.0", + "port-version": 6 + }, { "git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3", "version": "7.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index e25ba90c5c..a4c17f315b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -462,7 +462,7 @@ }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 5 + "port-version": 6 }, "azure-storage-files-datalake-cpp": { "baseline": "12.7.0", @@ -2130,7 +2130,7 @@ }, "directxtex": { "baseline": "2023-06-13", - "port-version": 0 + "port-version": 1 }, "directxtk": { "baseline": "2023-06-13", @@ -6190,7 +6190,7 @@ }, "paho-mqtt": { "baseline": "1.3.12", - "port-version": 0 + "port-version": 1 }, "paho-mqttpp3": { "baseline": "1.2.0", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 869ab86cd6..b8d18c044e 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281", + "version-date": "2023-06-13", + "port-version": 1 + }, { "git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3", "version-date": "2023-06-13", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index de20423c86..151e187570 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd", + "version": "1.3.12", + "port-version": 1 + }, { "git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a", "version": "1.3.12",