diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-05-11 23:03:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 14:03:00 -0700 |
| commit | 7b1016e10ef0434fe7045d320a9ee05b63e0efe9 (patch) | |
| tree | 8dfd99a0a9e410464bcff7fdbde713b5c97cbc38 | |
| parent | 77d2722945bd86802cdc7f40670771e43af5878f (diff) | |
| download | vcpkg-7b1016e10ef0434fe7045d320a9ee05b63e0efe9.tar.gz vcpkg-7b1016e10ef0434fe7045d320a9ee05b63e0efe9.zip | |
[qt5-base] fix install / packages dir being on different drives (#17666)
* [qt5] fix installed / vcpkg-root being on different drives.
* version stuff
| -rw-r--r-- | ports/qt5-base/cmake/qt_fix_makefile_install.cmake | 6 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 |
4 files changed, 12 insertions, 3 deletions
diff --git a/ports/qt5-base/cmake/qt_fix_makefile_install.cmake b/ports/qt5-base/cmake/qt_fix_makefile_install.cmake index 95831d29f..69b016fc8 100644 --- a/ports/qt5-base/cmake/qt_fix_makefile_install.cmake +++ b/ports/qt5-base/cmake/qt_fix_makefile_install.cmake @@ -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()
\ No newline at end of file diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 72b3f3401..39e0c5586 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index d0235b4f4..fd5049b73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5034,7 +5034,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 7 + "port-version": 8 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index cf2963fc4..d20697394 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0", + "version-semver": "5.15.2", + "port-version": 8 + }, + { "git-tree": "0a2e6f5403e24e41109d28db0c2330f8254774f2", "version-semver": "5.15.2", "port-version": 7 |