diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-15 16:32:11 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-22 01:45:50 +0000 |
| commit | 6ed288d17f79a7265fb7ae5f74d47194dc15340e (patch) | |
| tree | 4faec4c4d3f179e648da6d08d0184ca1fdc527fc /cmake | |
| parent | dd4875b54c85d14e0489af66c1e6697de862ce17 (diff) | |
CMake: fix the word order in "no_direct_extern_access"
And take the opportunity to remove the "m" in the qmake feature name and
.prf file.
Change-Id: I36b24183fbd041179f2ffffd170224ab75cdd968
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 396170d07b768ca53665c67046555e5fabe78801)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPlatformTargetHelpers.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index b345e1797c..835a0f679c 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -204,7 +204,7 @@ function(qt_internal_add_module target) qt_internal_get_framework_info(fw ${target}) endif() - if(NOT QT_FEATURE_no_extern_direct_access AND QT_FEATURE_reduce_relocations AND + if(NOT QT_FEATURE_no_direct_extern_access AND QT_FEATURE_reduce_relocations AND UNIX AND NOT is_interface_lib) # On x86 and x86-64 systems with ELF binaries (especially Linux), due to # a new optimization in GCC 5.x in combination with a recent version of diff --git a/cmake/QtPlatformTargetHelpers.cmake b/cmake/QtPlatformTargetHelpers.cmake index 47cffc8040..24c8749e62 100644 --- a/cmake/QtPlatformTargetHelpers.cmake +++ b/cmake/QtPlatformTargetHelpers.cmake @@ -41,7 +41,7 @@ function(qt_internal_setup_public_platform_target) endif() target_link_options(Platform INTERFACE "${libc_link_option}") endif() - if (QT_FEATURE_no_extern_direct_access) + if (QT_FEATURE_no_direct_extern_access) target_compile_options(Platform INTERFACE "$<$<CXX_COMPILER_ID:GNU>:-mno-direct-extern-access>") target_compile_options(Platform INTERFACE "$<$<CXX_COMPILER_ID:Clang>:-fno-direct-access-external-data>") endif() |