From 80847a0f4c15c2a80d319b6148e89f71d84a8d6a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 20 Nov 2022 12:25:56 -0800 Subject: [PATCH] CMake: move the qversiontagging files into the main file listing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplifies the code a little. Change-Id: Id8e48e8f498c4a029619fffd172964ca391d16d5 Reviewed-by: Jörg Bornemann --- src/corelib/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index e8be8fab98b..5d9c7a98286 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -38,6 +38,9 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/QtInstallPaths.cmake.in" ## Core Module: ##################################################################### +set(core_version_tagging_files + global/qversiontagging.cpp + global/qversiontagging.h) qt_internal_add_module(Core QMAKE_MODULE_CONFIG moc resources NO_GENERATE_METATYPES # metatypes are extracted manually below @@ -94,6 +97,7 @@ qt_internal_add_module(Core global/qtversionchecks.h global/qtypeinfo.h global/qtypes.cpp global/qtypes.h + ${core_version_tagging_files} global/qvolatile_p.h global/q20algorithm.h global/q20functional.h @@ -662,9 +666,6 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_journald PkgConfig::Libsystemd ) -set(core_version_tagging_files global/qversiontagging.cpp global/qversiontagging.h) -target_sources(Core PRIVATE ${core_version_tagging_files}) - # Disable LTO, as the symbols disappear somehow under GCC # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200) if(GCC)