From 36407d1b3cdba0fd740a85f8540230528a628ee0 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 5 Oct 2020 02:44:06 -0400 Subject: [PATCH] Add build dependency on Qt SVG (#6689) * Add dependency on Svg * Bundle SVG files --- ApplicationCode/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 5e43768f89..a023385881 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -27,8 +27,8 @@ option(RESINSIGHT_TREAT_WARNINGS_AS_ERRORS "Treat warnings as errors (stops buil find_package(Qt5 COMPONENTS Core QUIET) if (Qt5Core_FOUND) - find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets Xml Concurrent PrintSupport) - set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::PrintSupport) + find_package(Qt5 CONFIG REQUIRED Core Gui OpenGL Network Script Widgets Xml Concurrent PrintSupport Svg) + set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network Qt5::OpenGL Qt5::Script Qt5::Widgets Qt5::Xml Qt5::Concurrent Qt5::PrintSupport Qt5::Svg) endif(Qt5Core_FOUND) # NB: The generated file is written to Cmake binary folder to avoid source tree pollution @@ -596,6 +596,8 @@ if (RESINSIGHT_PRIVATE_INSTALL) # include platform files install(FILES ${_dir}/qt5/plugins/platforms/libqxcb.so DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/platforms/ ) + install(FILES ${_dir}/qt5/plugins/imageformats/libqsvg.so DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/imageformats/ ) + install(FILES ${_dir}/qt5/plugins/iconengines/libqsvgicon.so DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/iconengines/ ) endif(RESINSIGHT_QT5_BUNDLE_LIBRARIES)