From d37fd195a28ea86528d498c26f3eaa21eafb0e89 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Fri, 15 Feb 2019 10:00:52 +0100
Subject: [PATCH] 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>
---
 src/corelib/CMakeLists.txt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index ce341ff811e..06cd3e6f8d9 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)