diff options
Diffstat (limited to 'src/corelib/CMakeLists.txt')
-rw-r--r-- | src/corelib/CMakeLists.txt | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index c4461da6b5..00ba3f32f4 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -598,29 +598,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 @@ -1152,7 +1139,6 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype # edited qrc files. if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake) - corelib_add_mimetypes_resources(Core) # Generate qmimeprovider_database.cpp set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp") |