1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Compile qobject.cpp with same flags as Core

Browse Source 
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>
This commit is contained in:
Kevin Funk 2019-02-15 10:00:52 +01:00
parent 2bdb808929
commit d37fd195a2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/CMakeLists.txt
View File

@ -254,14 +254,12 @@ set_source_files_properties(${qobject_moc_files} PROPERTIES HEADER_FILE_ONLY ON)
target_sources(Core_qobject PRIVATE target_sources(Core_qobject PRIVATE
global/qnamespace.h global/qnamespace.h
kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h ${qobject_moc_files}) kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h ${qobject_moc_files})
target_include_directories(Core_qobject PRIVATE set_target_properties(Core_qobject PROPERTIES
"${CMAKE_CURRENT_BINARY_DIR}" COMPILE_OPTIONS $<TARGET_PROPERTY:Core,COMPILE_OPTIONS>
"${CMAKE_CURRENT_BINARY_DIR}/global" COMPILE_DEFINITIONS $<TARGET_PROPERTY:Core,COMPILE_DEFINITIONS>
"${CMAKE_CURRENT_BINARY_DIR}/kernel" INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
"${PROJECT_BINARY_DIR}/include" )
"${PROJECT_BINARY_DIR}/include/QtCore" target_include_directories(Core_qobject PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/kernel") # for moc_qobject.cpp
"${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}"
"${PROJECT_BINARY_DIR}/include/QtCore/${PROJECT_VERSION}/QtCore")
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) target_link_libraries(Core PRIVATE Core_qobject)