diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-03-11 12:41:36 +0100 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-03-11 20:32:08 +0100 |
commit | 57c1e8d5339979cf124f28c58adc87c3d91a7fc2 (patch) | |
tree | 1f65bedf276491fc90fbf793c1e42fec124b2973 /cmake/QtExecutableHelpers.cmake | |
parent | d743fd0d0a0387d4435dd8d35f57023492a6d54b (diff) |
build system: support module local definitions
This introduces a new helper function,
qt_internal_add_repo_local_defines and makes use of it in
qt_internal_add_{module,test,executable,benchmark,plugin}. That function
checks whether QT_EXTRA_INTERNAL_TARGET_DEFINES is set. If it is, the
defines listed in there will be aded to all targets passed to the
functions mentioned above.
The intended usage is that QT_EXTRA_INTERNAL_TARGET_DEFINES gets set
in the repository local .cmake.conf. This allows e.g. opting in to
source incompatible changes in leaf modules (as long as those are
guarded by some define).
Pick-to: 6.2 6.3
Fixes: QTBUG-101640
Change-Id: I06c3693ee69f46e95a48de724621f0c97e7cc3a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtExecutableHelpers.cmake')
-rw-r--r-- | cmake/QtExecutableHelpers.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index f70adad11a..3c6a1462eb 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -70,6 +70,9 @@ function(qt_internal_add_executable name) endif() qt_set_common_target_properties(${name}) + + qt_internal_add_repo_local_defines(${name}) + if(ANDROID) # The above call to qt_set_common_target_properties() sets the symbol # visibility to hidden, but for Android, we need main() to not be hidden |