Fix openssl path for CMake build system on macOS.

DEAKSoftware · Jul 20, 2021 · 212c5bf · 212c5bf
1 parent 2a52340
commit 212c5bf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh
@@ -3,14 +3,13 @@
 configureCMake() {
 
    cmake -S "${productRepoPath}" -B "${productBuildPath}" \
-      -D CMAKE_PREFIX_PATH="${libQtPath}" \
+      -D CMAKE_PREFIX_PATH="${libQtPath};${openSSLPath}" \
       -D CMAKE_BUILD_TYPE=Release \
       -D CMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
       -D CMAKE_OSX_ARCHITECTURES=x86_64 \
       -D SYNERGY_ENTERPRISE=ON \
       -D SYNERGY_REVISION="${productRevision}" \
       || exit 1
-
 }
 
 buildApplication() {

diff --git a/Scripts/Build/BuildWindows.cmd b/Scripts/Build/BuildWindows.cmd
@@ -20,7 +20,7 @@
 
    cmake -S "%productRepoPath%" -B "%productBuildPath%"^
       -G "%cmakeGenerator%"^
-      -D CMAKE_PREFIX_PATH="%libQtPath%"^
+      -D CMAKE_PREFIX_PATH="%libQtPath%;%openSSLPath%"^
       -D CMAKE_BUILD_TYPE=Release^
       -D SYNERGY_ENTERPRISE=ON^
       -D SYNERGY_REVISION="%productRevision%"^

diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py
@@ -14,6 +14,7 @@ class Configuration():
    toolsPath    = ""
 
    libQtPath      = ""
+   openSSLPath    = ""
    vcvarsallPath  = ""
    cmakeGenerator = ""
    linuxdeployURL = ""

diff --git a/Scripts/config.txt b/Scripts/config.txt
@@ -11,14 +11,16 @@
 [Windows]
 
    libQtPath      = C:\Qt\Qt5.12.9\5.12.9\msvc2017_64
+   openSSLPath    = .\Synergy-Core\ext\openssl\windows\x64
    vcvarsallPath  = C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
 
    # Run cmake --help to choose a suitable generator
    cmakeGenerator = Visual Studio 16 2019
 
 [Darwin]
 
-   libQtPath = ~/Qt5.12.9/5.12.9/clang_64
+   libQtPath   = ~/Qt5.12.9/5.12.9/clang_64
+   openSSLPath = /usr/local/opt/openssl
 
 [Linux]
 

diff --git a/Synergy-Core b/Synergy-Core