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

cmake: Respect NO_PRIVATE_MODULE when generating module pri files

Browse Source 
Change-Id: Id5816d6598a0a484c20674f34f6f809e68671e6b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-21 14:13:49 +02:00
parent 6baa0f4ccc
commit 1f53a91ed3
2 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtModuleHelpers.cmake
View File

@ -609,8 +609,14 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
endif() endif()
qt_internal_install_pdb_files(${target} "${pdb_install_dir}") qt_internal_install_pdb_files(${target} "${pdb_install_dir}")
if (arg_NO_PRIVATE_MODULE)
set(arg_NO_PRIVATE_MODULE "NO_PRIVATE_MODULE")
else()
unset(arg_NO_PRIVATE_MODULE)
endif()
qt_describe_module(${target}) qt_describe_module(${target})
qt_add_list_file_finalizer(qt_finalize_module ${target} ${arg_INTERNAL_MODULE} ${header_module}) qt_add_list_file_finalizer(qt_finalize_module ${target} ${arg_INTERNAL_MODULE} ${arg_NO_PRIVATE_MODULE} ${header_module})
endfunction() endfunction()
function(qt_finalize_module target) function(qt_finalize_module target)

5
cmake/QtPriHelpers.cmake
View File

@ -118,7 +118,7 @@ endfunction()
# Generates module .pri files for consumption by qmake # Generates module .pri files for consumption by qmake
function(qt_generate_module_pri_file target) function(qt_generate_module_pri_file target)
set(flags INTERNAL_MODULE HEADER_MODULE) set(flags INTERNAL_MODULE HEADER_MODULE NO_PRIVATE_MODULE)
set(options) set(options)
set(multiopts) set(multiopts)
cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN}) cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
@ -256,6 +256,7 @@ QT_MODULES += ${config_module_name}
) )
endif() endif()
if (NOT arg_NO_PRIVATE_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})
@ -321,6 +322,8 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
else() else()
add_dependencies(${target} ${target}_lib_pri) add_dependencies(${target} ${target}_lib_pri)
endif() endif()
endif()
qt_install(FILES "${pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules) qt_install(FILES "${pri_files}" DESTINATION ${INSTALL_MKSPECSDIR}/modules)
endfunction() endfunction()