[qttools] copy traget tools only if they exists. (#30442)

They do not exist if you crosscompile qt
This commit is contained in:
Daniel Schürmann 2023-05-10 01:58:41 +02:00 committed by GitHub
parent f35ba0c785
commit e1cdda71f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 4 deletions

View File

@ -98,9 +98,12 @@ if(VCPKG_TARGET_IS_OSX)
list(APPEND OSX_APP_FOLDERS qdbusviewer.app) list(APPEND OSX_APP_FOLDERS qdbusviewer.app)
endif() endif()
foreach(_appfolder IN LISTS OSX_APP_FOLDERS) foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
message(STATUS "Moving: ${_appfolder}") # Folders are only existing in case of native builds
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") message(STATUS "Moving: ${_appfolder}")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
endif()
endforeach() endforeach()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()

View File

@ -1,6 +1,7 @@
{ {
"name": "qttools", "name": "qttools",
"version": "6.5.0", "version": "6.5.0",
"port-version": 1,
"description": "Qt Tools", "description": "Qt Tools",
"homepage": "https://www.qt.io/", "homepage": "https://www.qt.io/",
"license": null, "license": null,

View File

@ -6798,7 +6798,7 @@
}, },
"qttools": { "qttools": {
"baseline": "6.5.0", "baseline": "6.5.0",
"port-version": 0 "port-version": 1
}, },
"qttranslations": { "qttranslations": {
"baseline": "6.5.0", "baseline": "6.5.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "98c6a3ef4410b89a77895592986355c43674a881",
"version": "6.5.0",
"port-version": 1
},
{ {
"git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347", "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347",
"version": "6.5.0", "version": "6.5.0",