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

Introduce NO_GENERATE_CPP_EXPORTS argument for qt_internal_add_module

Browse Source 
The argument is inverted GENERATE_CPP_EXPORTS argument. Use it
explicitly for the modules that do not require the autogenerated cpp
exports.

Task-number: QTBUG-90492
Change-Id: Ic67772ba9ed5e40f132a97e7d6844102ad023ff3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2023-11-28 14:01:19 +01:00
parent 1a7edf3ba7
commit d2f7015184
9 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtModuleHelpers.cmake
View File

@ -16,7 +16,8 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
NO_ADDITIONAL_TARGET_INFO
NO_GENERATE_METATYPES
NO_HEADERSCLEAN_CHECK
GENERATE_CPP_EXPORTS
GENERATE_CPP_EXPORTS # deprecated
NO_GENERATE_CPP_EXPORTS
NO_UNITY_BUILD
)
set(${single_args}
@ -422,7 +423,8 @@ function(qt_internal_add_module target)
# We should not generate export headers if module is defined as pure STATIC.
# Static libraries don't need to export their symbols, and corner cases when sources are
# also used in shared libraries, should be handled manually.
if(arg_GENERATE_CPP_EXPORTS AND NOT arg_STATIC)
if((NOT arg_NO_GENERATE_CPP_EXPORTS OR arg_GENERATE_CPP_EXPORTS) AND NOT arg_STATIC
AND NOT arg_HEADER_MODULE)
if(arg_CPP_EXPORT_HEADER_BASE_NAME)
set(cpp_export_header_base_name
"CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}"

1
src/assets/icons/CMakeLists.txt
View File

@ -5,6 +5,7 @@ qt_internal_add_module(ExampleIconsPrivate
CONFIG_MODULE_NAME example_icons
STATIC
INTERNAL_MODULE
NO_GENERATE_CPP_EXPORTS
)
set(icons_resource_files

1
src/platformsupport/devicediscovery/CMakeLists.txt
View File

@ -15,6 +15,7 @@ qt_internal_add_module(DeviceDiscoverySupportPrivate
QT_NO_CAST_FROM_ASCII
PUBLIC_LIBRARIES
Qt::CorePrivate
NO_GENERATE_CPP_EXPORTS
)
## Scopes:

1
src/platformsupport/fbconvenience/CMakeLists.txt
View File

@ -22,4 +22,5 @@ qt_internal_add_module(FbSupportPrivate
Qt::GuiPrivate
PRECOMPILED_HEADER
"../../corelib/global/qt_pch.h"
NO_GENERATE_CPP_EXPORTS
)

1
src/platformsupport/input/CMakeLists.txt
View File

@ -22,6 +22,7 @@ qt_internal_add_module(InputSupportPrivate
Qt::GuiPrivate
PRECOMPILED_HEADER
"../../corelib/global/qt_pch.h"
NO_GENERATE_CPP_EXPORTS
)
## Scopes:

1
src/platformsupport/kmsconvenience/CMakeLists.txt
View File

@ -19,4 +19,5 @@ qt_internal_add_module(KmsSupportPrivate
Libdrm::Libdrm
Qt::CorePrivate
Qt::GuiPrivate
NO_GENERATE_CPP_EXPORTS
)

1
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -46,6 +46,7 @@ qt_internal_add_module(EglFSDeviceIntegrationPrivate
EGL::EGL
HEADER_SYNC_SOURCE_DIRECTORY
"${CMAKE_CURRENT_SOURCE_DIR}/api"
NO_GENERATE_CPP_EXPORTS
)
## Scopes:

1
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
View File

@ -24,6 +24,7 @@ qt_internal_add_module(EglFsKmsGbmSupportPrivate
Qt::GuiPrivate
Qt::KmsSupportPrivate
gbm::gbm
NO_GENERATE_CPP_EXPORTS
)
#####################################################################
## QEglFSKmsGbmIntegrationPlugin Plugin:

1
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
View File

@ -24,4 +24,5 @@ qt_internal_add_module(EglFsKmsSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::KmsSupportPrivate
NO_GENERATE_CPP_EXPORTS
)