3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-base] Fix the incompatibility between configuration script and --x-buildtrees (#21657)

Browse Source 
* [qt5-base] Fix the incompatibility between configuration script and --x-buildtrees

* version

* Update ports/qt5-base/cmake/configure_qt.cmake

* Update ports/qt5-base/cmake/configure_qt.cmake

* version

* Re-fix expr

* version

* Update ports/qt5-base/cmake/configure_qt.cmake

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* Update versions/q-/qt5-base.json

* update regex expression

* version

Co-authored-by: Billy O'Neal <bion@microsoft.com>
This commit is contained in:
Jack·Boos·Yu 2021-12-10 06:20:48 +08:00 committed by GitHub
parent 0fe674df99
commit a7a0aaf265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5-base/cmake/configure_qt.cmake
View File

@ -142,7 +142,7 @@ function(configure_qt)
string(REPLACE "${CMAKE_CURRENT_INSTALLED_DIR_PATH}" "\${CURRENT_INSTALLED_DIR}" _contents ${_contents})
#string(REPLACE "HostPrefix=\${CURRENT_PACKAGES_DIR}" "HostPrefix=\${CURRENT_INSTALLED_DIR}" _contents ${_contents})
string(REPLACE "[EffectivePaths]\nPrefix=..\n" "" _contents ${_contents})
string(REPLACE "[EffectiveSourcePaths]\nPrefix=${_csc_SOURCE_PATH}\n" "" _contents ${_contents})
string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents})
string(REPLACE "Sysroot=\n" "" _contents ${_contents})
string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents})
file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}")

2
ports/qt5-base/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version-semver": "5.15.2",
"port-version": 17,
"port-version": 18,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [

2
versions/baseline.json
View File

@ -5526,7 +5526,7 @@
},
"qt5-base": {
"baseline": "5.15.2",
"port-version": 17
"port-version": 18
},
"qt5-canvas3d": {
"baseline": "0",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5793fff5370499ba464430142f86b971a23dff25",
"version-semver": "5.15.2",
"port-version": 18
},
{
"git-tree": "f8fbecca6183036771dc794859432a2a84435abb",
"version-semver": "5.15.2",