CMake: move the qversiontagging files into the main file listing
Simplifies the code a little. Change-Id: Id8e48e8f498c4a029619fffd172964ca391d16d5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
4234ce12dc
commit
80847a0f4c
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user