AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Convert Core_qobject to a static module

Browse Source 
This removes the last add_custom_target when used in conjunction with
the Ninja and CMake >= 3.17.

Change-Id: Ibb9bdff4b5bc00542d2a5ba631cea7e0510ad5e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-03-05 14:31:13 +01:00
parent 98fb632f47
commit fda03bfed0
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/CMakeLists.txt
View File

@ -27,10 +27,6 @@ file(RELATIVE_PATH QT_INVERSE_CONFIG_INSTALL_DIR ${_clean_prefix} ${CMAKE_INSTAL
## Core Module: ## Core Module:
##################################################################### #####################################################################
# special case begin
add_library(Core_qobject OBJECT)
# special case end
qt_add_module(Core qt_add_module(Core
GENERATE_METATYPES GENERATE_METATYPES
QMAKE_MODULE_CONFIG moc resources QMAKE_MODULE_CONFIG moc resources
@ -260,7 +256,6 @@ qt_add_module(Core
QtHarfBuzz # special case QtHarfBuzz # special case
Threads::Threads # special case Threads::Threads # special case
WrapDoubleConversion::WrapDoubleConversion # special case WrapDoubleConversion::WrapDoubleConversion # special case
Core_qobject
PUBLIC_LIBRARIES # special case: PUBLIC_LIBRARIES # special case:
Qt::Platform # special case: Qt::Platform # special case:
# special case begin # special case begin
@ -285,6 +280,13 @@ qt_generate_qconfig_cpp()
# Handle QObject: Automoc does not work for this as it would # Handle QObject: Automoc does not work for this as it would
# require to spill internals into users: # require to spill internals into users:
qt_add_module(Core_qobject STATIC
NO_SYNC_QT
NO_CONFIG_HEADER_FILE
NO_MODULE_HEADERS
INTERNAL_MODULE
SKIP_DEPENDS_INCLUDE
)
set_target_properties(Core_qobject PROPERTIES AUTOMOC OFF) set_target_properties(Core_qobject PROPERTIES AUTOMOC OFF)
qt_manual_moc(qobject_moc_files OUTPUT_MOC_JSON_FILES core_qobject_metatypes_json_list kernel/qobject.h global/qnamespace.h) qt_manual_moc(qobject_moc_files OUTPUT_MOC_JSON_FILES core_qobject_metatypes_json_list kernel/qobject.h global/qnamespace.h)
set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON) set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON)
@ -298,7 +300,8 @@ set_target_properties(Core_qobject PROPERTIES
) )
target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp
target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig) target_link_libraries(Core_qobject PRIVATE Qt::Platform Qt::GlobalConfig)
target_link_libraries(Core PRIVATE Core_qobject) extend_target(Core LIBRARIES Qt::Core_qobject)
add_dependencies(Core_qobject ${QT_CMAKE_EXPORT_NAMESPACE}::moc)
set(core_qobject_metatypes_json_args) set(core_qobject_metatypes_json_args)
if (NOT QT_WILL_INSTALL) if (NOT QT_WILL_INSTALL)
@ -310,13 +313,6 @@ qt6_generate_meta_types_json_file(Core_qobject
${core_qobject_metatypes_json_args} ${core_qobject_metatypes_json_args}
) )
if(NOT BUILD_SHARED_LIBS)
install(
TARGETS Core_qobject
EXPORT "${INSTALL_CMAKE_NAMESPACE}Targets"
)
endif()
# Core_qobject is never exported so we need to duplicate the metatypes file # Core_qobject is never exported so we need to duplicate the metatypes file
# interface on Core # interface on Core
get_target_property(core_qobject_metatypes_file_genex_build Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_BUILD) get_target_property(core_qobject_metatypes_file_genex_build Core_qobject QT_MODULE_META_TYPES_FILE_GENEX_BUILD)