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 install / packages dir being on different drives (#17666)

Browse Source 
* [qt5] fix installed / vcpkg-root being on different drives.

* version stuff
This commit is contained in:
Alexander Neumann 2021-05-11 23:03:00 +02:00 committed by GitHub
parent 77d2722945
commit 7b1016e10e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/qt5-base/cmake/qt_fix_makefile_install.cmake
View File

@ -7,7 +7,11 @@ function(qt_fix_makefile_install BUILD_DIR)
if(WIN32)
string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE)
string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE)
string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 0 2 INSTALLED_DRIVE)
string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 0 2 PACKAGES_DRIVE)
else()
set(INSTALLED_DRIVE)
set(PACKAGES_DRIVE)
set(INSTALLED_DIR_WITHOUT_DRIVE ${NATIVE_INSTALLED_DIR})
set(PACKAGES_DIR_WITHOUT_DRIVE ${NATIVE_PACKAGES_DIR})
endif()
@ -20,7 +24,7 @@ function(qt_fix_makefile_install BUILD_DIR)
foreach(MAKEFILE ${MAKEFILES})
file(READ "${MAKEFILE}" _contents)
#Set the correct install directory to packages
string(REPLACE "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}")
string(REPLACE "${INSTALLED_DRIVE}$(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "${PACKAGES_DRIVE}$(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}")
file(WRITE "${MAKEFILE}" "${_contents}")
endforeach()
endfunction()

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

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version-semver": "5.15.2",
"port-version": 7,
"port-version": 8,
"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

@ -5034,7 +5034,7 @@
},
"qt5-base": {
"baseline": "5.15.2",
"port-version": 7
"port-version": 8
},
"qt5-canvas3d": {
"baseline": "0",

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0",
"version-semver": "5.15.2",
"port-version": 8
},
{
"git-tree": "0a2e6f5403e24e41109d28db0c2330f8254774f2",
"version-semver": "5.15.2",