Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg] update CMake to 3.27.1 #31931

Merged
merged 22 commits into from
Jul 31, 2023
Merged

[vcpkg] update CMake to 3.27.1 #31931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5b26b5c
update cmake
Neumann-A Jun 10, 2023
e6c5e21
Merge remote-tracking branch 'upstream/master' into cmake_3.27.0
Neumann-A Jun 14, 2023
62fc79f
update to rc2
Neumann-A Jun 14, 2023
907c408
use nightly build
Neumann-A Jun 18, 2023
b6c30a3
update to rc3 drop freebsd due to dead link and update git while i am…
Neumann-A Jun 21, 2023
0d7c8b5
fix missing sha
Neumann-A Jun 22, 2023
a58ec03
fix relative path
Neumann-A Jun 23, 2023
05e0d20
Merge remote-tracking branch 'upstream/master' into cmake_3.27.0
Neumann-A Jul 19, 2023
ac1ea75
update to 3.27 release
Neumann-A Jul 19, 2023
a4607fb
Merge remote-tracking branch 'upstream/master' into cmake_3.27.0
Neumann-A Jul 20, 2023
4cd77a1
[paho-mqtt] remove usage of OPENSSL_ROOT_DIR
Neumann-A Jul 20, 2023
e4a478e
[directxtex] control optional directx-headers dep
Neumann-A Jul 20, 2023
ba1f20f
v db
Neumann-A Jul 20, 2023
a49e0fb
IN LIST -> IN_LIST
Neumann-A Jul 20, 2023
c8fbb7e
v db
Neumann-A Jul 20, 2023
ea73226
try fixing azure-storage-cpp
Neumann-A Jul 21, 2023
f8aebee
v db
Neumann-A Jul 21, 2023
ac8b010
Merge branch 'microsoft:master' into cmake_3.27.0
Neumann-A Jul 23, 2023
5de8e2e
Merge branch 'microsoft:master' into cmake_3.27.0
Neumann-A Jul 24, 2023
c40e827
Merge remote-tracking branch 'upstream/master' into cmake_3.27.0
Neumann-A Jul 26, 2023
0e86ff5
update to 3.27.1
Neumann-A Jul 26, 2023
a09a3b8
Merge branch 'microsoft:master' into cmake_3.27.0
Neumann-A Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/azure-storage-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/azure-storage-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
4 changes: 4 additions & 0 deletions ports/directxtex/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions ports/directxtex/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 2 additions & 0 deletions ports/paho-mqtt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ports/paho-mqtt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
43 changes: 18 additions & 25 deletions scripts/vcpkgTools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,32 @@
<archiveName>python-3.10.7.nupkg.zip</archiveName>
</tool>
<tool name="cmake" os="windows">
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.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>
<sha512>4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc</sha512>
<archiveName>cmake-3.25.1-windows-i386.zip</archiveName>
<version>3.27.1</version>
<exeRelativePath>cmake-3.27.1-windows-i386/bin/cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip</url>
<sha512>a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0</sha512>
<archiveName>cmake-3.27.1-windows-i386.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.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>
<sha512>6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a</sha512>
<archiveName>cmake-3.25.1-macos-universal.tar.gz</archiveName>
<version>3.27.1</version>
<exeRelativePath>cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz</url>
<sha512>78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7</sha512>
<archiveName>cmake-3.27.1-macos-universal.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.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>
<sha512>df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78</sha512>
<archiveName>cmake-3.25.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>
<version>3.27.1</version>
<exeRelativePath>cmake-3.27.1-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz</url>
<sha512>192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1</sha512>
<archiveName>cmake-3.27.1-linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="git" os="windows">
<version>2.7.4</version>
<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>
<sha512>f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f</sha512>
<archiveName>PortableGit-2.35.1.2-32-bit.7z.exe</archiveName>
<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>e483a890e77b427c20785e7528279338c7d99651e0afbf704bf2ff3cde23d0895c07e961603d133d5d78aea2308a2994e532974de41674e4f334423b1b47bd0e</sha512>
<archiveName>PortableGit-2.41.0-32-bit.7z.exe</archiveName>
</tool>
<tool name="git" os="linux">
<version>2.7.4</version>
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-storage-cpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "38122f7f0972f1c4d6b01b776f9c1edf81e5dfd0",
"version": "7.5.0",
"port-version": 6
},
{
"git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3",
"version": "7.5.0",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
},
"azure-storage-cpp": {
"baseline": "7.5.0",
"port-version": 5
"port-version": 6
},
"azure-storage-files-datalake-cpp": {
"baseline": "12.7.0",
Expand Down Expand Up @@ -2126,7 +2126,7 @@
},
"directxtex": {
"baseline": "2023-06-13",
"port-version": 0
"port-version": 1
},
"directxtk": {
"baseline": "2023-06-13",
Expand Down Expand Up @@ -6186,7 +6186,7 @@
},
"paho-mqtt": {
"baseline": "1.3.12",
"port-version": 0
"port-version": 1
},
"paho-mqttpp3": {
"baseline": "1.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/directxtex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281",
"version-date": "2023-06-13",
"port-version": 1
},
{
"git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3",
"version-date": "2023-06-13",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/paho-mqtt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd",
"version": "1.3.12",
"port-version": 1
},
{
"git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a",
"version": "1.3.12",
Expand Down
Loading