From 8dd88a522489ac9b0ee749cc2bd98c5985315ac1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Jan 2021 13:04:20 -0500 Subject: cmake-gui: Restore exclusion of static plugin installation This was broken by commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17). --- Source/QtDialog/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index a82884c..0ef725b 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -116,14 +116,15 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32)) endforeach() endforeach() endmacro() - install_qt_plugins(QT_COMPONENTS QT_PLUGINS) if(APPLE) + install_qt_plugins(QT_COMPONENTS QT_PLUGINS) 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) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = ../${_qt_plugin_dir}\n") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" -- cgit v0.12