1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Produce internal module pris like qmake does

Browse Source 
qmake treats internal modules as just the regular module file,
but with a _private suffix, as opposed to the current cmake
logic, that treats it as the private module file, resulting
in missing e.g. the Qt.foo.module entry.

Change-Id: Id55ca4c23921656d5abfd1d0fdf6430d4fe120bf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-21 14:23:38 +02:00
parent 155ee2bbd7
commit 83ad237771
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
cmake/QtPriHelpers.cmake
View File

@ -199,44 +199,49 @@ function(qt_generate_module_pri_file target)
unset(private_module_includes) unset(private_module_includes)
endif() endif()
qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules) set(pri_data_cmake_file "qt_lib_${config_module_name}_private.cmake")
set(config_module_name_base "${config_module_name}")
if (arg_INTERNAL_MODULE) if (arg_INTERNAL_MODULE)
string(PREPEND private_module_includes "${public_module_includes} ") string(APPEND config_module_name "_private")
set(private_module_frameworks ${public_module_frameworks}) endif()
qt_path_join(target_path ${QT_BUILD_DIR} ${INSTALL_MKSPECSDIR}/modules)
unset(private_module_frameworks)
if(arg_HEADER_MODULE)
set(module_plugin_types "")
else() else()
unset(private_module_frameworks) get_target_property(module_plugin_types ${target} QMAKE_MODULE_PLUGIN_TYPES)
if(arg_HEADER_MODULE) if(module_plugin_types)
set(module_plugin_types "") list(JOIN module_plugin_types " " module_plugin_types)
else() else()
get_target_property(module_plugin_types ${target} QMAKE_MODULE_PLUGIN_TYPES) set(module_plugin_types "")
if(module_plugin_types)
list(JOIN module_plugin_types " " module_plugin_types)
else()
set(module_plugin_types "")
endif()
endif() endif()
endif()
qt_get_direct_module_dependencies(${target} public_module_dependencies) qt_get_direct_module_dependencies(${target} public_module_dependencies)
list(JOIN public_module_dependencies " " public_module_dependencies) list(JOIN public_module_dependencies " " public_module_dependencies)
qt_path_join(pri_file_name "${target_path}" "qt_lib_${config_module_name}.pri") qt_path_join(pri_file_name "${target_path}" "qt_lib_${config_module_name}.pri")
list(APPEND pri_files "${pri_file_name}") list(APPEND pri_files "${pri_file_name}")
# Don't use $<TARGET_PROPERTY:${target},INTERFACE_COMPILE_DEFINITIONS> genex because that # Don't use $<TARGET_PROPERTY:${target},INTERFACE_COMPILE_DEFINITIONS> genex because that
# will compute the transitive list of all defines for a module (so Gui would get Core # will compute the transitive list of all defines for a module (so Gui would get Core
#defines too). Instead query just the public defines on the target. #defines too). Instead query just the public defines on the target.
get_target_property(target_defines "${target}" INTERFACE_COMPILE_DEFINITIONS) get_target_property(target_defines "${target}" INTERFACE_COMPILE_DEFINITIONS)
# We must filter out expressions of the form $<TARGET_PROPERTY:name>, because # We must filter out expressions of the form $<TARGET_PROPERTY:name>, because
# 1. They cannot be used in file(GENERATE) content. # 1. They cannot be used in file(GENERATE) content.
# 2. They refer to the consuming target we have no access to here. # 2. They refer to the consuming target we have no access to here.
list(FILTER target_defines EXCLUDE REGEX "\\$<TARGET_PROPERTY:[^,>]+>") list(FILTER target_defines EXCLUDE REGEX "\\$<TARGET_PROPERTY:[^,>]+>")
list(JOIN target_defines " " joined_target_defines) list(JOIN target_defines " " joined_target_defines)
file(GENERATE file(GENERATE
OUTPUT "${pri_file_name}" OUTPUT "${pri_file_name}"
CONTENT CONTENT
"QT.${config_module_name}.VERSION = ${PROJECT_VERSION} "QT.${config_module_name}.VERSION = ${PROJECT_VERSION}
QT.${config_module_name}.name = ${module} QT.${config_module_name}.name = ${module}
QT.${config_module_name}.module = ${module_name_in_pri}${QT_LIBINFIX} QT.${config_module_name}.module = ${module_name_in_pri}${QT_LIBINFIX}
QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE QT.${config_module_name}.libs = $$QT_MODULE_LIB_BASE
@ -251,12 +256,11 @@ QT.${config_module_name}.DEFINES = ${joined_target_defines}
QT.${config_module_name}.enabled_features = ${enabled_features} QT.${config_module_name}.enabled_features = ${enabled_features}
QT.${config_module_name}.disabled_features = ${disabled_features}${module_build_config} QT.${config_module_name}.disabled_features = ${disabled_features}${module_build_config}
QT_CONFIG += ${enabled_features} QT_CONFIG += ${enabled_features}
QT_MODULES += ${config_module_name} QT_MODULES += ${config_module_name_base}
" "
) )
endif()
if (NOT arg_NO_PRIVATE_MODULE) if (NOT arg_NO_PRIVATE_MODULE AND NOT arg_INTERNAL_MODULE)
set(pri_data_cmake_file "qt_lib_${config_module_name}_private.cmake") set(pri_data_cmake_file "qt_lib_${config_module_name}_private.cmake")
qt_generate_qmake_libraries_pri_content(${config_module_name} "${CMAKE_CURRENT_BINARY_DIR}" qt_generate_qmake_libraries_pri_content(${config_module_name} "${CMAKE_CURRENT_BINARY_DIR}"
${pri_data_cmake_file}) ${pri_data_cmake_file})