diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-17 10:40:37 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-17 12:23:44 +0200 |
| commit | 073a4d9e4bda3678f6ae3f2ac41c291c3a6dba3e (patch) | |
| tree | 5679b56b6d9997638844c9a69094caa40b049f5b /src/qml/Qt6QmlMacros.cmake | |
| parent | f1d37d999bf4088b430c7a42c78ddb5ec827a916 (diff) | |
CMake: Fix in-source example builds
QT_QMLTYPES_FILENAME can contain a path including subdirectories, so
before creating the marker file in the .generated subfolder, we need
to recreate the whole directory structure.
Amends 1d67ecd790fe08a7cea1327ee754a9b8e74d113f
Change-Id: I20ad48202d4e643df1ed3b86e631abb12d179b9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/qml/Qt6QmlMacros.cmake')
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index 71d65ad27a..6b24f34a2a 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -598,8 +598,8 @@ function(qt6_qml_type_registration target) set(cmd_args) set(plugin_types_file "${target_binary_dir}/${qmltypes_output_name}") - set(generated_marker_dir "${target_binary_dir}/.generated") - set(generated_marker_file "${generated_marker_dir}/${qmltypes_output_name}") + set(generated_marker_file "${target_binary_dir}/.generated/${qmltypes_output_name}") + get_filename_component(generated_marker_dir "${generated_marker_file}" DIRECTORY) set_target_properties(${target} PROPERTIES QT_QML_MODULE_PLUGIN_TYPES_FILE ${plugin_types_file} ) |