aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-11-25 12:49:05 -0600
committerluigi1111 <luigi1111w@gmail.com>2019-11-25 12:49:05 -0600
commit380f218b3a71711bb0a2203fc8bf61949eddd7b7 (patch)
treef8b8e64687a4a4876f8a5865eed0cb0bc6699eef
parent12647fac73302d22c2cdf03f74847ea950b3984d (diff)
parent56023facaab4d8abd0014d6d836177b747f6165d (diff)
downloadmonzero-gui-380f218b3a71711bb0a2203fc8bf61949eddd7b7.tar.gz
monzero-gui-380f218b3a71711bb0a2203fc8bf61949eddd7b7.tar.xz
monzero-gui-380f218b3a71711bb0a2203fc8bf61949eddd7b7.zip
Merge pull request #2494
56023fa build: MacOS openssl path provided by brew, fallback to default (xiphon)
-rw-r--r--monero-wallet-gui.pro10
1 files changed, 9 insertions, 1 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index 42d97b06..f8e30e33 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -370,11 +370,19 @@ macx {
# message("using static libraries")
# LIBS+= -Wl,-Bstatic
# }
+
+ OPENSSL_LIBRARY_DIRS = $$system(brew --prefix openssl, lines, EXIT_CODE)
+ equals(EXIT_CODE, 0) {
+ OPENSSL_LIBRARY_DIRS = $$OPENSSL_LIBRARY_DIRS/lib
+ } else {
+ OPENSSL_LIBRARY_DIRS = /usr/local/ssl/lib
+ }
+
QT += macextras
OBJECTIVE_SOURCES += src/qt/macoshelper.mm
LIBS+= \
-L/usr/local/lib \
- -L/usr/local/opt/openssl/lib \
+ -L$$OPENSSL_LIBRARY_DIRS \
-L/usr/local/opt/boost/lib \
-lboost_serialization \
-lboost_thread-mt \