Update OpenSSL version on Windows

kefir500 · Jan 18, 2025 · 1b7fd85 · 1b7fd85
1 parent 609b537
commit 1b7fd85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,13 +18,13 @@ jobs:
       - name: Download Tools
         run: python scripts\download.py
       - name: Download OpenSSL
-        run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
+        run: choco install -y openssl --version=1.1.1.2100 --x86
       - name: Build MSI Package
         id: build
         shell: cmd
         run: |
-          set QTDIR=%Qt5_DIR%
-          set OPENSSL=C:\OpenSSL
+          set "QTDIR=%Qt5_DIR%"
+          set "OPENSSL=C:\Program Files (x86)\OpenSSL-Win32"
           set PATH=%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin
           call scripts\windows\packages\msi\build.msi.bat || exit
           set /p VERSION=<VERSION
@@ -55,13 +55,13 @@ jobs:
       - name: Download Tools
         run: python scripts\download.py
       - name: Download OpenSSL
-        run: choco install -y openssl.light --version=1.1.1.20181020 --x86 --params "/InstallDir:C:\OpenSSL"
+        run: choco install -y openssl --version=1.1.1.2100 --x86
       - name: Build ZIP Package
         id: build
         shell: cmd
         run: |
-          set QTDIR=%Qt5_DIR%
-          set OPENSSL=C:\OpenSSL
+          set "QTDIR=%Qt5_DIR%"
+          set "OPENSSL=C:\Program Files (x86)\OpenSSL-Win32"
           call "scripts\windows\packages\zip\build.zip.bat" || exit
           set /p VERSION=<VERSION
           echo VERSION=%VERSION%>>%GITHUB_ENV%

diff --git a/scripts/windows/packages/msi/build.msi.bat b/scripts/windows/packages/msi/build.msi.bat
@@ -11,7 +11,7 @@ cmake "%~dp0\..\..\..\.." ^
     -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=. ^
     -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ^
     -DCMAKE_PREFIX_PATH="%QTDIR%" ^
-    -DOPENSSL_ROOT_DIR=%OPENSSL%
+    -DOPENSSL_ROOT_DIR="%OPENSSL%"
 cmake --build build --config Release || exit /b
 
 rem Package

diff --git a/scripts/windows/packages/zip/build.zip.bat b/scripts/windows/packages/zip/build.zip.bat
@@ -10,7 +10,7 @@ cmake "%~dp0\..\..\..\.." ^
     -B build ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_PREFIX_PATH="%QTDIR%" ^
-    -DOPENSSL_ROOT_DIR=%OPENSSL% ^
+    -DOPENSSL_ROOT_DIR="%OPENSSL%" ^
     -DPORTABLE=ON
 cmake --build build --config Release || exit /b
 cmake --install build --prefix "%FOLDER%"