diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-19 17:15:06 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-19 22:55:51 +0000 |
| commit | 90fd142b098c32eec81fabbcb29843e9e03e5063 (patch) | |
| tree | a8ba0ff18cf7fe111a94455424a564d7c673dfd3 | |
| parent | 83e222d8caf8fc54626bc66014c12d2af127cd5a (diff) | |
| parent | d68486547aaf05994f39786f8527bcb454c6db3f (diff) | |
Merge "CMake: Get rid of the Core_versiontagging object library"
| -rw-r--r-- | src/corelib/CMakeLists.txt | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 04c2cc1881..ab73d8b98c 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -618,29 +618,16 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_journald PkgConfig::Libsystemd ) -# special case begin -add_library(Core_versiontagging OBJECT - 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> -) +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 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() -qt_internal_extend_target(Core - SOURCES - $<TARGET_OBJECTS:Core_versiontagging> -) -# special case end - qt_internal_extend_target(Core CONDITION UNIX SOURCES io/qfilesystemengine_unix.cpp |