From ba44f86182bf49bb25bac115f94d509c27d15925 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 20 Jul 2021 12:20:51 +0200
Subject: [PATCH] [de] Removed qt.conf.
Is not required because of system-wide Qt installation via
aqtinstall.
---
scripts/cmake/packaging/PackagingMac.cmake | 8 --------
scripts/cmake/packaging/PackagingWin.cmake | 8 --------
2 files changed, 16 deletions(-)
diff --git a/scripts/cmake/packaging/PackagingMac.cmake b/scripts/cmake/packaging/PackagingMac.cmake
index c37ecd0d527..ceb5ac1f694 100644
--- a/scripts/cmake/packaging/PackagingMac.cmake
+++ b/scripts/cmake/packaging/PackagingMac.cmake
@@ -31,11 +31,3 @@ if(OGS_USE_CONAN)
EXCLUDE
)
endif()
-
-if(OGS_BUILD_GUI)
- install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
- file(WRITE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf"
- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n"
- )
- install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" DESTINATION bin)
-endif()
diff --git a/scripts/cmake/packaging/PackagingWin.cmake b/scripts/cmake/packaging/PackagingWin.cmake
index 5bfface3e05..4f600e45cb9 100644
--- a/scripts/cmake/packaging/PackagingWin.cmake
+++ b/scripts/cmake/packaging/PackagingWin.cmake
@@ -23,11 +23,3 @@ if(OGS_USE_CONAN)
file(GLOB MATCHED_FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/*.dll")
install(FILES ${MATCHED_FILES} DESTINATION bin)
endif()
-
-if(OGS_BUILD_GUI)
- install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
- file(WRITE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf"
- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n"
- )
- install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" DESTINATION bin)
-endif()
--
GitLab