diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-07 18:14:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-07 18:19:48 (GMT) |
| commit | a6abe70e72141f03d284dfcc6559c2b4e2848b8e (patch) | |
| tree | 0aa46f52a187c1870781991294e9dfc5bf9f68f6 /Source | |
| parent | 8dd88a522489ac9b0ee749cc2bd98c5985315ac1 (diff) | |
| download | CMake-a6abe70e72141f03d284dfcc6559c2b4e2848b8e.zip CMake-a6abe70e72141f03d284dfcc6559c2b4e2848b8e.tar.gz CMake-a6abe70e72141f03d284dfcc6559c2b4e2848b8e.tar.bz2 | |
cmake-gui: Restore minimal plugin installation for Qt5
Since commit f1de6f6682 (cmake-gui: Support building against Qt6,
2020-12-17) all available plugins for each Qt component are installed.
This installs more than we need for CMake, so restore Qt5-specific logic
to install only the plugins did before.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 0ef725b..9ae677b 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -117,14 +117,24 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32)) endforeach() endmacro() if(APPLE) - install_qt_plugins(QT_COMPONENTS QT_PLUGINS) + if (INSTALLED_QT_VERSION VERSION_EQUAL 5) + install_qt_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS) + else() + # FIXME: Minimize plugins for Qt6. + install_qt_plugins(QT_COMPONENTS QT_PLUGINS) + endif() file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = ${_qt_plugin_dir}\n") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources" ${COMPONENT}) elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES) - install_qt_plugins(QT_COMPONENTS QT_PLUGINS) + if (INSTALLED_QT_VERSION VERSION_EQUAL 5) + install_qt_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS) + else() + # FIXME: Minimize plugins for Qt6. + install_qt_plugins(QT_COMPONENTS QT_PLUGINS) + endif() file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = ../${_qt_plugin_dir}\n") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" |