diff options
| author | Yuhang Zhao <zhaoyuhang@rankyee.com> | 2023-05-23 16:41:08 +0800 |
|---|---|---|
| committer | Yuhang Zhao <yuhangzhao@deepin.org> | 2023-05-31 01:08:45 +0000 |
| commit | 389507a047e0ec0721535052df6ddf957fbb95b3 (patch) | |
| tree | f203daced969c0b866f7e80b5cb7967327d95275 /cmake | |
| parent | fb86c5a47060b11a7fa6ee4d93ff51f052b904aa (diff) | |
CMake: make compile options consistent for Qt created libraries
Currently some libraries created by Qt are lacking some compile
definitions and compile options, and this issue is causing us
troubles when building Qt statically. This patch tries to reduce
the parameter difference when compiling Qt's own libraries.
Change-Id: I3842943a874fab32ef90980e8aa29f5beb01feeb
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtPlatformTargetHelpers.cmake | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index e4dccd7f32..c368cebb2e 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -487,8 +487,6 @@ function(qt_internal_add_module target) endif() endif() - qt_internal_library_deprecation_level(deprecation_define) - if(NOT arg_HEADER_MODULE) qt_autogen_tools_initial_setup(${target}) endif() @@ -578,7 +576,6 @@ function(qt_internal_add_module target) QT_DEPRECATED_WARNINGS QT_BUILDING_QT QT_BUILD_${module_define_infix}_LIB ### FIXME: use QT_BUILD_ADDON for Add-ons or remove if we don't have add-ons anymore - ${deprecation_define} ) list(APPEND arg_LIBRARIES Qt::PlatformModuleInternal) endif() diff --git a/cmake/QtPlatformTargetHelpers.cmake b/cmake/QtPlatformTargetHelpers.cmake index 54d1916f9e..b1a78e69c7 100644 --- a/cmake/QtPlatformTargetHelpers.cmake +++ b/cmake/QtPlatformTargetHelpers.cmake @@ -63,6 +63,10 @@ function(qt_internal_setup_public_platform_target) # Generate a pkgconfig for Qt::Platform. qt_internal_generate_pkg_config_file(Platform) + + # Make sure Qt users use the same symbols as how we build Qt. + qt_internal_library_deprecation_level(deprecation_defines) + target_compile_definitions(Platform INTERFACE ${deprecation_defines}) endfunction() function(qt_internal_get_platform_definition_include_dir install_interface build_interface) |