Simplify Qt5::WindowsIntegrationPlugin addition

This commit is contained in:
Luke Street 2021-02-27 22:34:23 -05:00
parent 277c7fe1df
commit fb7f0011b9
1 changed files with 2 additions and 8 deletions

View File

@ -92,7 +92,6 @@ if (Qt6Widgets_FOUND)
Qt6::Network Qt6::Network
Qt6::Widgets Qt6::Widgets
Qt6::Xml) Qt6::Xml)
set(QT5_WINDOWS_INTEGRATION_PLUGIN "")
else () else ()
set(Qt_LIBS set(Qt_LIBS
Qt5::Core Qt5::Core
@ -100,20 +99,15 @@ else ()
Qt5::Network Qt5::Network
Qt5::Widgets Qt5::Widgets
Qt5::Xml) Qt5::Xml)
if (WIN32) if (WIN32)
set(QT5_WINDOWS_INTEGRATION_PLUGIN list(APPEND Qt_LIBS Qt5::WindowsIntegrationPlugin)
Qt5::WindowsIntegrationPlugin)
else ()
set(QT5_WINDOWS_INTEGRATION_PLUGIN "")
endif () endif ()
endif () endif ()
target_link_libraries(hecl-gui PRIVATE target_link_libraries(hecl-gui PRIVATE
${Qt_LIBS} ${Qt_LIBS}
hecl-light hecl-light
zeus zeus
QuaZip::QuaZip QuaZip::QuaZip)
${QT5_WINDOWS_INTEGRATION_PLUGIN})
target_include_directories(hecl-gui PRIVATE quazip/quazip) target_include_directories(hecl-gui PRIVATE quazip/quazip)
target_compile_definitions(hecl-gui PRIVATE QUAZIP_STATIC=1) target_compile_definitions(hecl-gui PRIVATE QUAZIP_STATIC=1)