Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include static svg plugin if not using static Qt

This commit is contained in:
Martchus 2017-08-20 02:23:02 +02:00
parent d441590274
commit b45f2e7edf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/modules/QtConfig.cmake
View File

@ -75,8 +75,8 @@ foreach(KF_MODULE ${IMPORTED_KF_MODULES})
endforeach()
# built-in plugins when doing static build
# -> ensure platform integration plugins for corresponding platforms are built-in when creating a GUI application
if(USE_STATIC_QT5_Gui OR USE_STATIC_QT5_Widgets OR USE_STATIC_QT5_Quick)
# ensure platform integration plugins for corresponding platforms are built-in when creating a GUI application
if(NOT USE_STATIC_QT5_Gui)
find_qt5_module(Gui REQUIRED)
endif()
@ -87,21 +87,21 @@ if(USE_STATIC_QT5_Gui OR USE_STATIC_QT5_Widgets OR USE_STATIC_QT5_Quick)
else()
message(WARNING "The required platform plugin for your platform is unknown an can not be linked in statically.")
endif()
endif()
# -> ensure SVG plugins are built-in if configured
if(SVG_SUPPORT OR SVG_ICON_SUPPORT)
if(NOT USE_STATIC_QT5_Svg)
find_qt5_module(Svg REQUIRED)
use_qt5_module(Svg REQUIRED)
# ensure SVG plugins are built-in if configured
if(SVG_SUPPORT OR SVG_ICON_SUPPORT)
if(NOT USE_STATIC_QT5_Svg)
find_qt5_module(Svg REQUIRED)
use_qt5_module(Svg REQUIRED)
endif()
use_static_qt5_plugin(Svg Svg)
endif()
use_static_qt5_plugin(Svg Svg)
endif()
if(SVG_ICON_SUPPORT)
if(NOT USE_STATIC_QT5_Svg)
find_qt5_module(Svg REQUIRED)
use_qt5_module(Svg REQUIRED)
if(SVG_ICON_SUPPORT)
if(NOT USE_STATIC_QT5_Svg)
find_qt5_module(Svg REQUIRED)
use_qt5_module(Svg REQUIRED)
endif()
use_static_qt5_plugin(Svg SvgIcon)
endif()
use_static_qt5_plugin(Svg SvgIcon)
endif()
# option for built-in translations