diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-06 10:11:15 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-06 08:24:21 +0000 |
| commit | 37cdd44982466546376375328712b9c05fa8a529 (patch) | |
| tree | 8645da7c60663ccd906afca10575e4bdd67b427c /cmake/QtBuild.cmake | |
| parent | 82941a3f1bab6c385376761d53456c838b6cbaad (diff) | |
Fix "make install"
Don't try to report an installable public module .pri file for internal
modules.
Change-Id: Ide6a50420e0b5448b141c842df4c891baca4a9d9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index c3eb321ad4..166bb3b6c4 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -301,8 +301,7 @@ function(qt_generate_module_pri_file target target_path pri_files_var) cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN}) qt_internal_module_info(module "${target}") - qt_path_join(pri_file_name "${target_path}" "qt_lib_${module_lower}.pri") - set(pri_files "${pri_file_name}") + set(pri_files) get_target_property(enabled_features "${target}" QT_ENABLED_PUBLIC_FEATURES) get_target_property(disabled_features "${target}" QT_DISABLED_PUBLIC_FEATURES) @@ -325,6 +324,9 @@ function(qt_generate_module_pri_file target target_path pri_files_var) endif() if (NOT ${arg_INTERNAL_MODULE}) + qt_path_join(pri_file_name "${target_path}" "qt_lib_${module_lower}.pri") + list(APPEND pri_files "${pri_file_name}") + file(GENERATE OUTPUT "${pri_file_name}" CONTENT |