qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix installation of qmlcache's .prf files in cross-builds 

In cross-builds of Qt we missed to install qtquickcompiler.prf and
qmlcache.prf. Fix that by installing these files before the
qt_internal_return_unless_building_tools call.

Remove qmake2cmake conversion cruft as drive-by.

Fixes: QTBUG-132423
Pick-to: 6.5 6.8 6.9
Change-Id: Ic7a63af90985e42c221cce2c54de285f03b09999
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2025-01-02 16:09:59 +01:00
parent 4bbaaf34db
commit 2c39e1196e
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/qmlcachegen/CMakeLists.txt
View File

@ -1,8 +1,6 @@
# Copyright (C) 2022 The Qt Company Ltd. # Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# Generated from qmlcachegen.pro.
##################################################################### #####################################################################
## qmlcachegen Tool: ## qmlcachegen Tool:
##################################################################### #####################################################################
@ -20,37 +18,7 @@ qt_internal_add_tool(${target_name}
LIBRARIES LIBRARIES
Qt::QmlCompilerPrivate Qt::QmlCompilerPrivate
) )
qt_internal_return_unless_building_tools()
#### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>:
# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
# QMAKE_SUBSTITUTES = "cmake_config_file"
# QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator"
# _OPTION = "host_build"
# build_integration.files = "qmlcache.prf" "qtquickcompiler.prf"
# build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features"
# cmake_build_integration.files = "$$cmake_config_file.output"
# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt6QuickCompiler"
# cmake_config_file.input = "$$PWD/Qt6QuickCompilerConfig.cmake.in"
# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt6QuickCompiler/Qt6QuickCompilerConfig.cmake"
## Scopes:
#####################################################################
#### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build:
# INSTALLS = "cmake_build_integration" "build_integration"
#### Keys ignored in scope 3:.:.:qmlcachegen.pro:else:
# COPIES = "cmake_build_integration" "build_integration"
#### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
#### Keys ignored in scope 5:.:.:qmlcachegen.pro:QMAKE_HOST.os___equals___Windows:
# CMAKE_BIN_SUFFIX = ".exe"
# special case begin
# Install public prf files. # Install public prf files.
set(qmlcachegen_mkspecs set(qmlcachegen_mkspecs
"${CMAKE_CURRENT_SOURCE_DIR}/qmlcache.prf" "${CMAKE_CURRENT_SOURCE_DIR}/qmlcache.prf"
@ -60,4 +28,5 @@ set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
qt_path_join(mkspecs_install_dir "${QT_INSTALL_DIR}" "${mkspecs_install_dir}" "features") qt_path_join(mkspecs_install_dir "${QT_INSTALL_DIR}" "${mkspecs_install_dir}" "features")
qt_copy_or_install(FILES "${qmlcachegen_mkspecs}" qt_copy_or_install(FILES "${qmlcachegen_mkspecs}"
DESTINATION ${mkspecs_install_dir}) DESTINATION ${mkspecs_install_dir})
# special case end
qt_internal_return_unless_building_tools()