mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5-declarative] no absolute paths (#21859)
This commit is contained in:
parent
2c8f00a1b0
commit
52cb57e8ad
@ -1,11 +1,15 @@
|
||||
|
||||
|
||||
function(qt_submodule_installation)
|
||||
qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${ARGV})
|
||||
cmake_parse_arguments(_csc "" "OUT_SOURCE_PATH" "" ${ARGN})
|
||||
qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${_csc_UNPARSED_ARGUMENTS})
|
||||
if(QT_UPDATE_VERSION)
|
||||
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE)
|
||||
else()
|
||||
qt_build_submodule(${TARGET_SOURCE_PATH} ${ARGV})
|
||||
qt_build_submodule(${TARGET_SOURCE_PATH} ${_csc_UNPARSED_ARGUMENTS})
|
||||
qt_install_copyright(${TARGET_SOURCE_PATH})
|
||||
endif()
|
||||
if(DEFINED _csc_OUT_SOURCE_PATH)
|
||||
set(${_csc_OUT_SOURCE_PATH} ${TARGET_SOURCE_PATH} PARENT_SCOPE)
|
||||
endif()
|
||||
endfunction()
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"version-semver": "5.15.2",
|
||||
"port-version": 16,
|
||||
"port-version": 17,
|
||||
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"dependencies": [
|
||||
|
@ -1,2 +1,3 @@
|
||||
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
|
||||
qt_submodule_installation(PATCHES limits_include.patch)
|
||||
qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.2/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "")
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-declarative",
|
||||
"version-string": "5.15.2",
|
||||
"port-version": 2,
|
||||
"version": "5.15.2",
|
||||
"port-version": 3,
|
||||
"description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.",
|
||||
"dependencies": [
|
||||
{
|
||||
|
@ -5526,7 +5526,7 @@
|
||||
},
|
||||
"qt5-base": {
|
||||
"baseline": "5.15.2",
|
||||
"port-version": 16
|
||||
"port-version": 17
|
||||
},
|
||||
"qt5-canvas3d": {
|
||||
"baseline": "0",
|
||||
@ -5546,7 +5546,7 @@
|
||||
},
|
||||
"qt5-declarative": {
|
||||
"baseline": "5.15.2",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"qt5-doc": {
|
||||
"baseline": "5.15.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f8fbecca6183036771dc794859432a2a84435abb",
|
||||
"version-semver": "5.15.2",
|
||||
"port-version": 17
|
||||
},
|
||||
{
|
||||
"git-tree": "5f510633de982d6e75e3d1170af23feedf208166",
|
||||
"version-semver": "5.15.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "670f3d6bfa437ca047f1d1644743e2f2012524c8",
|
||||
"version": "5.15.2",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "0cef09afb36f9debf22319dc4adccf478c611885",
|
||||
"version-string": "5.15.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user