diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-07 18:04:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-07 18:19:48 (GMT) |
| commit | 8dd88a522489ac9b0ee749cc2bd98c5985315ac1 (patch) | |
| tree | d3c22e73bb3f1236d5087d637a1d4b2b6e8f9ee0 /Source/QtDialog | |
| parent | a65db7ef6ac0f8e4cacaa851a26cc3a0f4d5860b (diff) | |
| download | CMake-8dd88a522489ac9b0ee749cc2bd98c5985315ac1.zip CMake-8dd88a522489ac9b0ee749cc2bd98c5985315ac1.tar.gz CMake-8dd88a522489ac9b0ee749cc2bd98c5985315ac1.tar.bz2 | |
cmake-gui: Restore exclusion of static plugin installation
This was broken by commit f1de6f6682 (cmake-gui: Support building
against Qt6, 2020-12-17).
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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" |