diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-03-01 17:24:16 +1100 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-03-10 18:46:48 +1100 |
| commit | 78a64e310efc9f3e91bda855fa8275caf10bea4f (patch) | |
| tree | 6fa47956770c21c01f34fbd99789872f7e175bc0 /cmake/QtResourceHelpers.cmake | |
| parent | 1df915ee1de5170c377019decf0229a2cd9dde7c (diff) | |
qtdeclarative now directly handles more qml-specific logic
Associated changes in the qtdeclarative repo now ensure that arguments
for qml plugins are handled on the calling side. This reduces the
qml-specific logic needed in qtbase and gives qtdeclarative clearer
control over qml build and install locations.
As part of that work, the INSTALL_LOCATION keyword used in
qt_internal_record_rcc_object_files() has been renamed to
INSTALL_DIRECTORY to make it consistent with the keyword used for the
same concept in other commands.
Pick-to: 6.1
Change-Id: Iebd319899f63d79fbe15ce965b84ce324c28a508
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'cmake/QtResourceHelpers.cmake')
| -rw-r--r-- | cmake/QtResourceHelpers.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index 1c18de41fd..3c719d1dd0 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -23,13 +23,13 @@ function(qt_internal_add_resource target resourceName) ) qt_internal_record_rcc_object_files("${target}" "${out_targets}" - INSTALL_LOCATION "${INSTALL_LIBDIR}") + INSTALL_DIRECTORY "${INSTALL_LIBDIR}") endif() endfunction() function(qt_internal_record_rcc_object_files target resource_targets) set(args_optional "") - set(args_single INSTALL_LOCATION) + set(args_single INSTALL_DIRECTORY) set(args_multi "") cmake_parse_arguments(arg @@ -48,7 +48,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) # Compute the install location of a resource object file in a prefix build. # It's comprised of thee following path parts: # - # part (1) INSTALL_LOCATION. + # part (1) INSTALL_DIRECTORY. # A usual value is '${INSTALL_LIBDIR}/' for libraries # and '${INSTALL_QMLDIR}/foo/bar/' for qml plugin resources. # @@ -70,9 +70,9 @@ function(qt_internal_record_rcc_object_files target resource_targets) set(object_file_name "${generated_cpp_file_relative_path}${CMAKE_CXX_OUTPUT_EXTENSION}") qt_path_join(rcc_object_file_path "objects-$<CONFIG>" ${out_target} "${object_file_name}") - if(arg_INSTALL_LOCATION) + if(arg_INSTALL_DIRECTORY) qt_path_join(rcc_object_file_path - "${arg_INSTALL_LOCATION}" "${rcc_object_file_path}") + "${arg_INSTALL_DIRECTORY}" "${rcc_object_file_path}") else() message(FATAL_ERROR "No install location given for object files to be installed" " for the following resource target: '${out_target}'") |