[vcpkg baseline] [Qt6] add FETCH_REF for qt modules without tag (#21925)

* add FETCH_REF for qt modules without tag

* libyaml add version to pkgconfig file

* more login output

* use the target in the wrapper.

* remove trace output bump port version

* version stuff
This commit is contained in:
Alexander Neumann 2021-12-09 00:58:20 +01:00 committed by GitHub
parent 0a65a2f5f7
commit 74db2afdd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 27 additions and 6 deletions

View File

@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f81148..8006536 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,3 +158,10 @@ install(
@@ -158,3 +158,11 @@ install(
FILES ${config_version_file}
DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
)
@ -11,5 +11,6 @@ index 4f81148..8006536 100644
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(PACKAGE_VERSION 0.1)
+configure_file(yaml-0.1.pc.in ${PROJECT_BINARY_DIR}/yaml-0.1.pc @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/yaml-0.1.pc DESTINATION lib/pkgconfig)

View File

@ -1,7 +1,7 @@
{
"name": "libyaml",
"version-string": "0.2.5",
"port-version": 2,
"port-version": 3,
"description": "A C library for parsing and emitting YAML.",
"homepage": "https://github.com/yaml/libyaml",
"dependencies": [

View File

@ -1,6 +1,7 @@
{
"name": "qtapplicationmanager",
"version-semver": "6.2.2",
"port-version": 1,
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"supports": "!(windows & arm)",

View File

@ -47,7 +47,7 @@ index 1dab912..c09e97f 100644
+ endif()
+else()
+ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)
+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES})
+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml)
endif()
-
-add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED)

View File

@ -34,6 +34,7 @@ function(qt_download_submodule)
URL "https://code.qt.io/qt/${PORT}.git"
REF "${${PORT}_REF}"
${UPDATE_PORT_GIT_OPTIONS}
${QT_FETCH_REF}
PATCHES ${_qarg_PATCHES}
)

View File

@ -7,9 +7,11 @@ if(PORT MATCHES "qtquickcontrols2")
endif()
### Setting up the git tag.
set(QT_FETCH_REF "")
set(QT_GIT_TAG "v${QT_VERSION}")
if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager")
# So much for consistency ....
set(QT_FETCH_REF FETCH_REF "${QT_VERSION}")
set(QT_GIT_TAG "${QT_VERSION}")
endif()

View File

@ -1,6 +1,7 @@
{
"name": "qtbase",
"version-semver": "6.2.2",
"port-version": 1,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [

View File

@ -4094,7 +4094,7 @@
},
"libyaml": {
"baseline": "0.2.5",
"port-version": 2
"port-version": 3
},
"libyuv": {
"baseline": "2021-04-15",
@ -5694,11 +5694,11 @@
},
"qtapplicationmanager": {
"baseline": "6.2.2",
"port-version": 0
"port-version": 1
},
"qtbase": {
"baseline": "6.2.2",
"port-version": 0
"port-version": 1
},
"qtcharts": {
"baseline": "6.2.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0a7af4d5e003c4971aa031bf5533ac14f35e91d7",
"version-string": "0.2.5",
"port-version": 3
},
{
"git-tree": "888d62d1f7440f3c9c5ff403e85175372903c0ef",
"version-string": "0.2.5",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "79db0a47002752179eb5aacedca44c0bc670030c",
"version-semver": "6.2.2",
"port-version": 1
},
{
"git-tree": "ca033ed7578b002c1ce195d879c622333231d159",
"version-semver": "6.2.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c343c019fd735cbe38bd56b00460539e94eaa9a",
"version-semver": "6.2.2",
"port-version": 1
},
{
"git-tree": "c314a6af00c3a57bbd887c834cc0b5f80bfd65fc",
"version-semver": "6.2.2",