test

Author: raphaelscholle

src/CMakeLists.txt

@@ -224,11 +224,6 @@ if (WIN32)
             "${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1.dll" "${CMAKE_BINARY_DIR}/deploy"
     )
 
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/windows/openhdimagewriter.nsi.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/openhdimagewriter.nsi"
-        @ONLY)
-
     add_custom_command(TARGET ${PROJECT_NAME}
         POST_BUILD
         COMMAND "${WINDEPLOYQT}" --no-translations --no-webkit2 --no-opengl-sw --angle --qmldir "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/deploy/OpenHDImageWriter.exe")
@@ -247,7 +242,9 @@ if (WIN32)
     # miss them. Copy them explicitly so the NSIS script can bundle them, but
     # don't fail the build if a Qt installation omits the optional module.
     set(QT_QUICKCONTROLS_DLL "${Qt5_DIR}/../../../bin/Qt5QuickControls.dll")
+    set(QT_QUICKCONTROLS_DLL_PRESENT OFF)
     if(EXISTS "${QT_QUICKCONTROLS_DLL}")
+        set(QT_QUICKCONTROLS_DLL_PRESENT ON)
         add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -276,6 +273,11 @@ if (WIN32)
         message(WARNING "Qt Quick Dialogs QML directory not found at ${QT_QUICKDIALOGS_QML_DIR}; skipping explicit staging")
     endif()
 
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/windows/openhdimagewriter.nsi.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/openhdimagewriter.nsi"
+        @ONLY)
+
     set(OPENHD_SETTINGS_MAP_JSON "${CMAKE_CURRENT_LIST_DIR}/../doc/openhd_settings_map.json")
     if (NOT EXISTS "${OPENHD_SETTINGS_MAP_JSON}")
         message(FATAL_ERROR "Unable to find openhd_settings_map.json at ${OPENHD_SETTINGS_MAP_JSON}")

src/windows/openhdimagewriter.nsi.in

@@ -208,8 +208,9 @@ File "deploy\Qt5Qml.dll"
 File "deploy\Qt5QmlModels.dll"
 File "deploy\Qt5QmlWorkerScript.dll"
 File "deploy\Qt5Quick.dll"
-IfFileExists "deploy\Qt5QuickControls.dll" 0 +2
+!if "@QT_QUICKCONTROLS_DLL_PRESENT@" == "ON"
 File "deploy\Qt5QuickControls.dll"
+!endif
 File "deploy\Qt5QuickControls2.dll"
 File "deploy\Qt5QuickTemplates2.dll"
 File "deploy\Qt5Svg.dll"