diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-12 10:43:05 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-12 09:01:35 +0000 |
| commit | b25260bac692c2d94cacbf513419c06ac54154e2 (patch) | |
| tree | bd11a99da391ce45d2fda21219cfe0772713f6d8 /cmake | |
| parent | 1720970102836c20383b192fca6dbc17ee743392 (diff) | |
Change quick compiler generated code path
We now compile all qml files from the quick compiler in separate
directories qmlcache/${resource_name} to prevent issues where the same
qml file is present in more than one resource file.
Change-Id: I6857ff6aaaa21112896d5d39bbe11d3ffe524ec8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 490df89289..852ec0ace9 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2456,7 +2456,7 @@ function(qt_quick_compiler_process_resources target resource_name) string(REGEX REPLACE "\.js$" "_js" compiled_file ${file_relative}) string(REGEX REPLACE "\.mjs$" "_mjs" compiled_file ${compiled_file}) string(REGEX REPLACE "\.qml$" "_qml" compiled_file ${compiled_file}) - set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${compiled_file}.cpp") + set(compiled_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/${compiled_file}.cpp") add_custom_command( OUTPUT ${compiled_file} DEPENDS ${file_absolute} @@ -2469,13 +2469,13 @@ function(qt_quick_compiler_process_resources target resource_name) target_sources(${target} PRIVATE ${compiled_file}) endforeach() - set(qmlcache_loader_list "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}_qml_loader_file_list.rsp") + set(qmlcache_loader_list "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/qml_loader_file_list.rsp") file(GENERATE OUTPUT ${qmlcache_loader_list} CONTENT "$<JOIN:${file_resource_paths},\n>" ) - set(qmlcache_loader_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}_qmlcache_loader.cpp") + set(qmlcache_loader_file "${CMAKE_CURRENT_BINARY_DIR}/qmlcache/${resource_name}/qmlcache_loader.cpp") set(resource_name_arg "${resource_name}.qrc") if (chained_resource_name) set(resource_name_arg "${resource_name_arg}=${chained_resource_name}") |