Fix openssl path for CMake build system on macOS.

master
DominikDeak 3 years ago
parent 2a52340a9d
commit 212c5bf7fa
No known key found for this signature in database
GPG Key ID: 85514EC0CCE7007C
  1. 3
      Scripts/Build/BuildDarwin.sh
  2. 2
      Scripts/Build/BuildWindows.cmd
  3. 1
      Scripts/Detail/Config.py
  4. 2
      Scripts/config.txt
  5. 2
      Synergy-Core

@ -3,14 +3,13 @@
configureCMake() { configureCMake() {
cmake -S "${productRepoPath}" -B "${productBuildPath}" \ cmake -S "${productRepoPath}" -B "${productBuildPath}" \
-D CMAKE_PREFIX_PATH="${libQtPath}" \ -D CMAKE_PREFIX_PATH="${libQtPath};${openSSLPath}" \
-D CMAKE_BUILD_TYPE=Release \ -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.12 \ -D CMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
-D CMAKE_OSX_ARCHITECTURES=x86_64 \ -D CMAKE_OSX_ARCHITECTURES=x86_64 \
-D SYNERGY_ENTERPRISE=ON \ -D SYNERGY_ENTERPRISE=ON \
-D SYNERGY_REVISION="${productRevision}" \ -D SYNERGY_REVISION="${productRevision}" \
|| exit 1 || exit 1
} }
buildApplication() { buildApplication() {

@ -20,7 +20,7 @@
cmake -S "%productRepoPath%" -B "%productBuildPath%"^ cmake -S "%productRepoPath%" -B "%productBuildPath%"^
-G "%cmakeGenerator%"^ -G "%cmakeGenerator%"^
-D CMAKE_PREFIX_PATH="%libQtPath%"^ -D CMAKE_PREFIX_PATH="%libQtPath%;%openSSLPath%"^
-D CMAKE_BUILD_TYPE=Release^ -D CMAKE_BUILD_TYPE=Release^
-D SYNERGY_ENTERPRISE=ON^ -D SYNERGY_ENTERPRISE=ON^
-D SYNERGY_REVISION="%productRevision%"^ -D SYNERGY_REVISION="%productRevision%"^

@ -14,6 +14,7 @@ class Configuration():
toolsPath = "" toolsPath = ""
libQtPath = "" libQtPath = ""
openSSLPath = ""
vcvarsallPath = "" vcvarsallPath = ""
cmakeGenerator = "" cmakeGenerator = ""
linuxdeployURL = "" linuxdeployURL = ""

@ -11,6 +11,7 @@
[Windows] [Windows]
libQtPath = C:\Qt\Qt5.12.9\5.12.9\msvc2017_64 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 vcvarsallPath = C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
# Run cmake --help to choose a suitable generator # Run cmake --help to choose a suitable generator
@ -19,6 +20,7 @@
[Darwin] [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] [Linux]

@ -1 +1 @@
Subproject commit 063519a8882169e35938df3018742b917ce43ed0 Subproject commit 67d824b8483003d531097dded302965b88ee867b
Loading…
Cancel
Save