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

[qtbase] fix installed qt.conf (#21944)

Browse Source 
* fix paths in qt.conf

* version stuff
This commit is contained in:
Alexander Neumann 2021-12-10 03:19:33 +01:00 committed by GitHub
parent a4f322c567
commit bd4169a47f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/qtbase/portfile.cmake
View File

@ -323,19 +323,31 @@ if(NOT VCPKG_TARGET_IS_IOS)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios")
endif()
file(RELATIVE_PATH installed_to_host "${CURRENT_INSTALLED_DIR}" "${CURRENT_HOST_INSTALLED_DIR}")
file(RELATIVE_PATH host_to_installed "${CURRENT_HOST_INSTALLED_DIR}" "${CURRENT_INSTALLED_DIR}")
if(installed_to_host)
string(APPEND installed_to_host "/")
string(APPEND host_to_installed "/")
endif()
set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in")
set(REL_PATH)
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY)
set(REL_PATH "")
set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) # For vcpkg-qmake
set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}")
set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}")
set(CURRENT_INSTALLED_DIR "./../../../")
set(CURRENT_HOST_INSTALLED_DIR "./../../../")
set(CURRENT_HOST_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${installed_to_host}")
## Configure installed qt.conf
set(REL_HOST_TO_DATA "${host_to_installed}")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf")
set(REL_PATH debug/)
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf")
set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}")
set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY)
set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}")
configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) # For vcpkg-qmake
if(VCPKG_TARGET_IS_WINDOWS)
set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16)

2
ports/qtbase/qt.conf.in
View File

@ -25,7 +25,7 @@ Data=share/Qt6
Translations=translations/@QT6_DIRECTORY_PREFIX@
Examples=share/examples/@QT6_DIRECTORY_PREFIX@
HostPrefix=${CURRENT_HOST_INSTALLED_DIR}
HostData=${CURRENT_INSTALLED_DIR}/share/Qt6
HostData=@REL_HOST_TO_DATA@share/Qt6
HostBinaries=@REL_PATH@bin
HostLibraries=@REL_PATH@lib
HostLibraryExecutables=tools/Qt6/bin

2
ports/qtbase/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version-semver": "6.2.2",
"port-version": 1,
"port-version": 2,
"description": "Qt 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

@ -5698,7 +5698,7 @@
},
"qtbase": {
"baseline": "6.2.2",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.2.2",

5
versions/q-/qtbase.json
View File

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