diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2019-02-15 10:00:52 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2019-02-15 09:31:33 +0000 |
| commit | d37fd195a28ea86528d498c26f3eaa21eafb0e89 (patch) | |
| tree | caa9a178897aa5f790932b9fedbddea389c0d728 /src | |
| parent | 2bdb8089293bc0122f51cd3cbc2a31836f99f9aa (diff) | |
cmake: Compile qobject.cpp with same flags as Core
Makes sure qobject.cpp.o also sees -DQT_BUILD_CORE_LIB
Change-Id: I2aaf1cec62eeab07bbec6e4135bbe144d4ae7fba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index ce341ff811..06cd3e6f8d 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -254,14 +254,12 @@ set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON) target_sources(Core_qobject PRIVATE global/qnamespace.h kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h ${qobject_moc_files}) -target_include_directories(Core_qobject PRIVATE - "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_BINARY_DIR}/global" - "${CMAKE_CURRENT_BINARY_DIR}/kernel" - "${PROJECT_BINARY_DIR}/include" - "${PROJECT_BINARY_DIR}/include/QtCore" - "${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}" - "${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}/QtCore") +set_target_properties(Core_qobject PROPERTIES + COMPILE_OPTIONS $<TARGET_PROPERTY:Core,COMPILE_OPTIONS> + COMPILE_DEFINITIONS $<TARGET_PROPERTY:Core,COMPILE_DEFINITIONS> + INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> +) +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 PRIVATE Core_qobject) |