mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 05:43:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg-tools] update cmake and git (windows only) (#22985)

Browse Source 
* update cmake to 3.22.0-rc3 to verify catalogue compatibility and be ready for final release

* update to cmake 3.22 final release

* [vcpkgTools] update to cmake 3.22.1

* update test port

* update cmake to 3.22.2
and git for windows to 2.35.1.2

* fix missing uuid on osx in ignition-transport.

* modernize

* fix hash

* fix qtbase regression

* try fixing the pc file search

* hidaoi give trace logs

* give me trace output

* bit of pkgconf changes. Need system search paths for pkgconf to work correctly.

* fix underscore

* remove extra x

* revert port changes

* add license to cmake test port

* fix arm regression due to not finding taglib.

* version stuff

Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Alexander Neumann <you@example.com>
This commit is contained in:
Alexander Neumann 2022-02-26 07:51:53 +01:00 committed by GitHub
parent d457f8f162
commit 1b1ae50e1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/qtinterfaceframework/portfile.cmake
View File

@ -79,6 +79,7 @@ set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_cmake_configure(${_opt}
OPTIONS ${FEATURE_OPTIONS}
"-DCMAKE_PROGRAM_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf" # need to overwrite vcpkg.cmake
"-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found.
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})

5
ports/qtinterfaceframework/vcpkg.json
View File

@ -1,10 +1,15 @@
{
"name": "qtinterfaceframework",
"version": "6.2.3",
"port-version": 1,
"description": "Qt Interface Framework",
"homepage": "https://www.qt.io/",
"license": null,
"dependencies": [
{
"name": "pkgconf",
"host": true
},
{
"name": "qtdeclarative",
"default-features": false

31
scripts/test_ports/cmake/portfile.cmake
View File

@ -4,22 +4,22 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO cmake/cmake
REF
b7b0fb430397bafae4a7bd80b41d474c91a3b7f3
8428e39ed9cddb3b7f1a6f7a58cb8617503183d2
SHA512
3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2
4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226
HEAD_REF master
)
set(OPTIONS)
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
list(APPEND OPTIONS -DBUILD_CursesDialog=ON)
list(APPEND OPTIONS "-DBUILD_CursesDialog=ON")
else()
list(APPEND OPTIONS -DBUILD_CursesDialog=OFF)
list(APPEND OPTIONS "-DBUILD_CursesDialog=OFF")
endif()
if(VCPKG_CROSSCOMPILING)
list(APPEND OPTIONS -DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools)
list(APPEND OPTIONS -DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools)
list(APPEND OPTIONS -DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools)
list(APPEND OPTIONS "-DQt6CoreTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6CoreTools")
list(APPEND OPTIONS "-DQt6WidgetsTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6WidgetsTools")
list(APPEND OPTIONS "-DQt6GuiTools_DIR=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6GuiTools")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged
list(APPEND OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows)
endif()
@ -30,9 +30,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${OPTIONS}
-DBUILD_TESTING=OFF
@ -51,7 +50,7 @@ vcpkg_configure_cmake(
-DCMake_QT_MAJOR_VERSION:STRING=6
)
vcpkg_install_cmake(ADD_BIN_TO_PATH)
vcpkg_cmake_install(ADD_BIN_TO_PATH)
vcpkg_copy_pdbs()
if(NOT VCPKG_TARGET_IS_OSX)
@ -65,16 +64,16 @@ if(NOT VCPKG_TARGET_IS_OSX)
vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN)
else()
# On OSX everything is within a CMake.app folder
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
file(RENAME "${CURRENT_PACKAGES_DIR}/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/CMake.app")
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/CMake.app")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/debug)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/CMake.app" "${CURRENT_PACKAGES_DIR}/tools/debug/CMake.app")
endif()
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
# Handle copyright
configure_file(${SOURCE_PATH}/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
configure_file("${SOURCE_PATH}/Copyright.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)

8
scripts/test_ports/cmake/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "cmake",
"version-string": "3.20.0",
"port-version": 1,
"version-string": "3.22.2",
"description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
"homepage": "https://cmake.org/",
"license": "BSD-3-Clause",
"dependencies": [
"bzip2",
"curl",
@ -18,6 +18,10 @@
},
"nghttp2",
"qtbase",
{
"name": "vcpkg-cmake",
"host": true
},
"zlib",
"zstd"
]

38
scripts/vcpkgTools.xml
View File

@ -8,25 +8,25 @@
<archiveName>python-3.10.1-embed-win32.zip</archiveName>
</tool>
<tool name="cmake" os="windows">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-windows-i386.zip</url>
<sha512>3aa0e9c904bf8abfc9441c1f0fd571e613ade7bc12f36211cd9006b4a2226552815ec8b00c8ef43583769d9d90996e75d2e832b3718ac3b85d3f9fb4db1cd60a</sha512>
<archiveName>cmake-3.21.1-windows-i386.zip</archiveName>
<version>3.22.2</version>
<exeRelativePath>cmake-3.22.2-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip</url>
<sha512>969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79</sha512>
<archiveName>cmake-3.22.2-windows-i386.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-macos-universal.tar.gz</url>
<sha512>0e5d3781101d6f54d916066719a0ff27d052b40e999dfd8e1f53d8d22d99e45cad22fc28b5d2a9e810b0cc8237e640d7747aff2a2c0896571c8a69ecdd0a9e41</sha512>
<archiveName>cmake-3.21.1-macos-universal.tar.gz</archiveName>
<version>3.22.2</version>
<exeRelativePath>cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz</url>
<sha512>08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac</sha512>
<archiveName>cmake-3.22.2-macos-universal.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.tar.gz</url>
<sha512>deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f</sha512>
<archiveName>cmake-3.21.1-linux-x86_64.tar.gz</archiveName>
<version>3.22.2</version>
<exeRelativePath>cmake-3.22.2-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz</url>
<sha512>579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b</sha512>
<archiveName>cmake-3.22.2linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.20.4</version>
@ -36,11 +36,11 @@
<archiveName>cmake-3.20.4.txz</archiveName>
</tool>
<tool name="git" os="windows">
<version>2.32.0.2</version>
<version>2.35.1.2</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe</url>
<sha512>867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348</sha512>
<archiveName>PortableGit-2.32.0.2-32-bit.7z.exe</archiveName>
<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>
</tool>
<tool name="git" os="linux">
<version>2.7.4</version>

2
versions/baseline.json
View File

@ -5814,7 +5814,7 @@
},
"qtinterfaceframework": {
"baseline": "6.2.3",
"port-version": 0
"port-version": 1
},
"qtkeychain": {
"baseline": "0.13.2",

5
versions/q-/qtinterfaceframework.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26fa7610125a5a6b54ced0cda87ab6621a42a1d9",
"version": "6.2.3",
"port-version": 1
},
{
"git-tree": "bdbc69bff861cdbd2dad8178d022b10d4f6abfe2",
"version": "6.2.3",