1
0
Fork 0

Fix Linux-only Qt includes

This commit is contained in:
Ilya Fedin 2020-05-05 16:02:17 +04:00 committed by John Preston
parent b026d86b57
commit 81a0fc7970

View file

@ -79,18 +79,11 @@ else()
${qt_loc}/include ${qt_loc}/include
${qt_loc}/include/QtCore ${qt_loc}/include/QtCore
${qt_loc}/include/QtGui ${qt_loc}/include/QtGui
${qt_loc}/include/QtSvg
${qt_loc}/include/QtWidgets ${qt_loc}/include/QtWidgets
${qt_loc}/include/QtThemeSupport
${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtCore/${qt_version} ${qt_loc}/include/QtCore/${qt_version}
${qt_loc}/include/QtGui/${qt_version} ${qt_loc}/include/QtGui/${qt_version}
${qt_loc}/include/QtThemeSupport/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtCore/${qt_version}/QtCore ${qt_loc}/include/QtCore/${qt_version}/QtCore
${qt_loc}/include/QtGui/${qt_version}/QtGui ${qt_loc}/include/QtGui/${qt_version}/QtGui
${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
) )
if (Qt5DBus_FOUND) if (Qt5DBus_FOUND)
@ -100,16 +93,26 @@ else()
) )
endif() endif()
if (LINUX)
target_include_directories(external_qt SYSTEM
INTERFACE
${qt_loc}/include/QtSvg
${qt_loc}/include/QtThemeSupport
${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtThemeSupport/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtThemeSupport/${qt_version}/QtThemeSupport
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
)
endif()
target_compile_definitions(external_qt target_compile_definitions(external_qt
INTERFACE INTERFACE
_REENTRANT _REENTRANT
QT_STATICPLUGIN QT_STATICPLUGIN
QT_PLUGIN QT_PLUGIN
QT_WAYLANDCLIENT_LIB
QT_THEME_SUPPORT_LIB
QT_WIDGETS_LIB QT_WIDGETS_LIB
QT_NETWORK_LIB QT_NETWORK_LIB
QT_SVG_LIB
QT_GUI_LIB QT_GUI_LIB
QT_CORE_LIB QT_CORE_LIB
) )
@ -121,6 +124,15 @@ else()
) )
endif() endif()
if (LINUX)
target_compile_definitions(external_qt
INTERFACE
QT_WAYLANDCLIENT_LIB
QT_THEME_SUPPORT_LIB
QT_SVG_LIB
)
endif()
if (WIN32) if (WIN32)
set(qt_lib_prefix "") set(qt_lib_prefix "")
set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib) set(qt_lib_suffix $<$<CONFIG:Debug>:d>.lib)