Move Win installer creation to CMake

Author: tomas-soltys

.github/workflows/ci.yml

@@ -81,11 +81,26 @@ jobs:
 
       - name: Install OpenSSL (Windows)
         if: startsWith(matrix.os, 'windows-')
-        run: |
-          choco install openssl.light -y --params "/InstallDir:C:\OpenSSL" || echo "OpenSSL may already be installed"
-          # Persist OPENSSL_ROOT for later CMake configure step
-          Write-Output "OPENSSL_ROOT=C:\OpenSSL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $installDir = 'C:\OpenSSL'
+          $max = 3
+          for ($i = 1; $i -le $max; $i++) {
+            try {
+              choco install openssl.light -y --params "/InstallDir:$installDir"
+              break
+            } catch {
+              if ($i -eq $max) { throw }
+              Write-Host "OpenSSL install failed (attempt $i/$max). Retrying in 20s..."
+              Start-Sleep -Seconds 20
+            }
+          }
+          if (Test-Path "$installDir\bin\openssl.exe") {
+            "OPENSSL_ROOT=$installDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          } else {
+            Write-Host "OpenSSL not found at $installDir; not setting OPENSSL_ROOT."
+          }
 
       # Qt
       - name: Install Qt
@@ -180,25 +195,9 @@ jobs:
         shell: pwsh
 
       # Build
-      - name: Build (Unix)
-        if: matrix.os != 'windows-latest'
+      - name: Build
         run: cmake --build build-Release --target package --parallel
 
-      - name: Build (Windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: cmake --build build-Release --parallel
-        shell: pwsh
-
-      - name: Stage install (Windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: cmake --install build-Release --prefix build-Release/staging
-        shell: pwsh
-
-      - name: Create Inno Setup installer (Windows)
-        if: startsWith(matrix.os, 'windows-')
-        run: iscc build-Release/setup.iss
-        shell: pwsh
-
       # Notarize
       - name: Notarize DMG with notarytool (macOS)
         if: startsWith(matrix.os, 'macos-')

src/CMakeLists.txt

@@ -272,9 +272,32 @@ if(WIN32)
         install(FILES ${_rn_json_path} DESTINATION doc COMPONENT Application)
     endif()
     if(OPENSSL_ROOT)
-        install(FILES ${OPENSSL_ROOT}/bin/openssl.exe DESTINATION bin COMPONENT Application)
-        install(FILES ${OPENSSL_ROOT}/bin/libcrypto-3-x64.dll DESTINATION bin COMPONENT Application)
-        install(FILES ${OPENSSL_ROOT}/bin/libssl-3-x64.dll DESTINATION bin COMPONENT Application)
+        set(_openssl_exe "${OPENSSL_ROOT}/bin/openssl.exe")
+        set(_openssl_crypto "${OPENSSL_ROOT}/bin/libcrypto-3-x64.dll")
+        set(_openssl_ssl "${OPENSSL_ROOT}/bin/libssl-3-x64.dll")
+        if(EXISTS "${_openssl_exe}" AND EXISTS "${_openssl_crypto}" AND EXISTS "${_openssl_ssl}")
+            install(FILES "${_openssl_exe}" DESTINATION bin COMPONENT Application)
+            install(FILES "${_openssl_crypto}" DESTINATION bin COMPONENT Application)
+            install(FILES "${_openssl_ssl}" DESTINATION bin COMPONENT Application)
+        else()
+            message(WARNING "OPENSSL_ROOT is set to '${OPENSSL_ROOT}', but required OpenSSL runtime files were not found. Skipping bundling OpenSSL into the installer.")
+        endif()
+    endif()
+
+    # MinGW runtime DLLs
+    if(MINGW)
+        get_filename_component(_mingw_bin_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
+        foreach(_dll IN ITEMS
+                libgomp-1.dll
+                libgcc_s_seh-1.dll
+                libstdc++-6.dll
+                libwinpthread-1.dll)
+            if(EXISTS "${_mingw_bin_dir}/${_dll}")
+                install(FILES "${_mingw_bin_dir}/${_dll}" DESTINATION bin COMPONENT Application)
+            else()
+                message(WARNING "MinGW runtime DLL not found, skipping: ${_mingw_bin_dir}/${_dll}")
+            endif()
+        endforeach()
     endif()
 elseif(APPLE)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_TARGET_NAME}/${PROJECT_SHORT_REL_NAME}.app DESTINATION . USE_SOURCE_PERMISSIONS COMPONENT Application)
@@ -441,6 +464,26 @@ if(WIN32)
         ${CMAKE_BINARY_DIR}/setup.iss
         @ONLY
     )
+
+    find_program(ISCC_EXECUTABLE
+        NAMES iscc ISCC
+        PATHS
+            "$ENV{ProgramFiles\(x86\)}/Inno Setup 6"
+            "$ENV{ProgramFiles}/Inno Setup 6"
+        DOC "Inno Setup Compiler (iscc.exe)"
+    )
+
+    if(ISCC_EXECUTABLE)
+        configure_file(
+            ${CMAKE_SOURCE_DIR}/packaging/windows/run_iscc.cmake.in
+            ${CMAKE_BINARY_DIR}/run_iscc.cmake
+            @ONLY
+        )
+        set(CPACK_POST_BUILD_SCRIPTS "${CMAKE_BINARY_DIR}/run_iscc.cmake")
+        message(STATUS "Inno Setup found: ${ISCC_EXECUTABLE} — installer .exe will be created by the 'package' target")
+    else()
+        message(STATUS "Inno Setup (iscc.exe) not found; installer .exe will not be created. Install from https://jrsoftware.org/isinfo.php")
+    endif()
 endif()
 
 if(APPLE)