1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CMake: Get rid of the Core_versiontagging object library"

Browse Source
This commit is contained in:
Alexandru Croitor 2021-03-19 17:15:06 +01:00 committed by Qt CI Bot
commit 90fd142b09
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/corelib/CMakeLists.txt
View File

@ -618,29 +618,16 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_journald
PkgConfig::Libsystemd PkgConfig::Libsystemd
) )
# special case begin set(core_version_tagging_files global/qversiontagging.cpp global/qversiontagging.h)
add_library(Core_versiontagging OBJECT target_sources(Core PRIVATE ${core_version_tagging_files})
global/qversiontagging.cpp global/qversiontagging.h
)
set_target_properties(Core_versiontagging PROPERTIES
COMPILE_OPTIONS $<TARGET_PROPERTY:Core,COMPILE_OPTIONS>
COMPILE_DEFINITIONS $<TARGET_PROPERTY:Core,COMPILE_DEFINITIONS>
INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
)
# Disable LTO, as the symbols disappear somehow under GCC # Disable LTO, as the symbols disappear somehow under GCC
# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200) # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200)
if(GCC AND FEATURE_ltcg) if(GCC AND FEATURE_ltcg)
target_compile_options(Core_versiontagging PRIVATE "-fno-lto") set_source_files_properties(${core_version_tagging_files}
PROPERTIES COMPILE_OPTIONS "-fno-lto")
endif() endif()
qt_internal_extend_target(Core
SOURCES
$<TARGET_OBJECTS:Core_versiontagging>
)
# special case end
qt_internal_extend_target(Core CONDITION UNIX qt_internal_extend_target(Core CONDITION UNIX
SOURCES SOURCES
io/qfilesystemengine_unix.cpp io/qfilesystemengine_unix.cpp