[improveQtCMake] Minor improvements to the CMake scripts for the GUI application

Merging branch 'improveQtCMake'  into 'main'.

See merge request !1431

App/CMakeLists.txt

@@ -143,6 +143,55 @@ if(BA_APPLE_BUNDLE)
         "${BUILD_VAR_DIR}/adjust_mac_bundle.zsh" @ONLY)
 endif()
 
+if(WIN32)
+    message(STATUS "Configuring the GUI package")
+
+    foreach(comp ${QtComponents})
+        set(QtComp Qt6::${comp})
+        get_target_property(dll ${QtComp} LOCATION_Release)
+        get_property(dll TARGET ${QtComp} PROPERTY LOCATION_Release)
+        install(FILES ${dll} DESTINATION ${destination_lib} COMPONENT Libraries)
+        message(STATUS "Install Qt lib ${QtComp} (${dll})")
+    endforeach()
+
+    # extract Qt root-dir
+    # 'C:/Qt/6.2.4/msvc2019_64/lib/cmake/Qt6' => 'C:/Qt/6.2.4/msvc2019_64'
+    file(TO_CMAKE_PATH "${Qt_DIR}" qt_dir_str)
+    string(REGEX MATCH "(.*)/lib/cmake.*" _v "${qt_dir_str}")
+    set(Qt_ROOT_DIR "${CMAKE_MATCH_1}")
+    message(STATUS "Qt root directory: '${Qt_ROOT_DIR}'")
+
+    install(FILES
+    ${Qt_ROOT_DIR}/bin/opengl32sw.dll
+    DESTINATION ${destination_lib} COMPONENT Libraries)
+
+    set(Qt_PLUGINS_DIR "${Qt_ROOT_DIR}/plugins")
+    message(STATUS "Qt plugins directory: '${Qt_PLUGINS_DIR}'")
+
+    install(FILES
+    ${Qt_PLUGINS_DIR}/platforms/qwindows.dll
+    DESTINATION bin/platforms COMPONENT Libraries)
+
+    install(FILES
+    ${Qt_PLUGINS_DIR}/iconengines/qsvgicon.dll
+    DESTINATION bin/iconengines COMPONENT Libraries)
+
+    install(FILES
+    ${Qt_PLUGINS_DIR}/imageformats/qjpeg.dll
+    ${Qt_PLUGINS_DIR}/imageformats/qsvg.dll
+    DESTINATION bin/imageformats COMPONENT Libraries)
+
+    set(QT_VISTA_STYLE ${Qt_PLUGINS_DIR}/styles/qwindowsvistastyle.dll)
+    if(EXISTS ${QT_VISTA_STYLE})
+        install(FILES ${QT_VISTA_STYLE}
+                DESTINATION bin/styles COMPONENT Libraries)
+    else()
+        message(AUTHOR_WARNING File ${QT_VISTA_STYLE} not found.)
+    endif()
+    unset(QT_VISTA_STYLE)
+
+endif()
+
 if(LINUX)
     set(LINUXPKG_MAIN_EXE "${CMAKE_BINARY_DIR}/bin/${executable_name}")
     set(LINUXPKG_FRAMEWORK_DEST "${destination_lib}")

GUI/CMakeLists.txt

@@ -74,41 +74,3 @@ install(TARGETS ${lib}
     LIBRARY DESTINATION ${destination_lib}
     RUNTIME DESTINATION ${destination_lib}
     COMPONENT Libraries)
-
-if(WIN32)
-    # --- Qt ---
-    install(FILES
-    ${QTDIR}/bin/Qt6Widgets.DLL
-    ${QTDIR}/bin/Qt6Core.dll
-    ${QTDIR}/bin/Qt6Gui.dll
-    ${QTDIR}/bin/Qt6Xml.dll
-    ${QTDIR}/bin/Qt6Svg.dll
-    ${QTDIR}/bin/Qt6PrintSupport.dll
-    ${QTDIR}/bin/Qt6OpenGL.dll
-    ${QTDIR}/bin/Qt6OpenGLWidgets.dll
-    ${QTDIR}/bin/opengl32sw.dll
-    DESTINATION ${destination_lib} COMPONENT Libraries)
-
-    install(FILES
-    ${QTDIR}/plugins/platforms/qwindows.dll
-    DESTINATION bin/platforms COMPONENT Libraries)
-
-    install(FILES
-    ${QTDIR}/plugins/iconengines/qsvgicon.dll
-    DESTINATION bin/iconengines COMPONENT Libraries)
-
-    install(FILES
-    ${QTDIR}/plugins/imageformats/qjpeg.dll
-    ${QTDIR}/plugins/imageformats/qsvg.dll
-    DESTINATION bin/imageformats COMPONENT Libraries)
-
-    set(QT_VISTA_STYLE ${QTDIR}/plugins/styles/qwindowsvistastyle.dll)
-    if(EXISTS ${QT_VISTA_STYLE})
-        install(FILES ${QT_VISTA_STYLE}
-                DESTINATION bin/styles COMPONENT Libraries)
-    else()
-        message(AUTHOR_WARNING File ${QT_VISTA_STYLE} not found.)
-    endif()
-    unset(QT_VISTA_STYLE)
-
-endif()

cmake/BornAgain/Qt.cmake

 find_package(OpenGL REQUIRED)
-find_package(Qt6 COMPONENTS Core Gui Widgets PrintSupport Svg OpenGL OpenGLWidgets REQUIRED)
+
+set(QtComponents Core Gui Widgets PrintSupport Svg OpenGL OpenGLWidgets)
+find_package(Qt6 COMPONENTS ${QtComponents} REQUIRED)
 
 message(STATUS "Found Qt6 version ${Qt6Core_VERSION}")