Fix openssl dependency on windows.

3 years ago · 476f16fa0d
parent f5f4515d18
commit 476f16fa0d
4 changed files with 6 additions and 2 deletions
--- a/Scripts/Build/BuildWindows.cmd
+++ b/Scripts/Build/BuildWindows.cmd
@ -18,6 +18,9 @@

 :configureCMake

+   mkdir -p "%productRepoPath%\ext\openssl\windows\x64"
+   xcopy "%openSSLPath%" "%productRepoPath%\ext\openssl\windows\x64" /e /y || exit 1
+
   cmake -S "%productRepoPath%" -B "%productBuildPath%"^
      -G "%cmakeGenerator%"^
      -D CMAKE_PREFIX_PATH="%libQtPath%;%openSSLPath%"^
--- a/Scripts/Install/PackageListChoco.config
+++ b/Scripts/Install/PackageListChoco.config
@ -2,6 +2,7 @@
 <packages>
   <package id="git" />
   <package id="python3" />
+   <package id="openssl" forceX86="true" />
   <package id="cmake" installArguments="ADD_CMAKE_TO_PATH=System" />
 </packages>

--- a/Scripts/config.txt
+++ b/Scripts/config.txt
@ -11,7 +11,7 @@
 [Windows]

   libQtPath      = C:\Qt\Qt5.12.9\5.12.9\msvc2017_64
-   openSSLPath    = .\Synergy-Core\ext\openssl\windows\x64
+   openSSLPath    = C:\Program Files\OpenSSL-Win64
   vcvarsallPath  = C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat

   # Run cmake --help to choose a suitable generator
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 67d824b8483003d531097dded302965b88ee867b
+Subproject commit 37bbd3c0ee7708c0bf26bebcc115d02c97bbbe38