aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-04-17 20:49:18 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-04-17 20:49:18 -0500
commit9760886eff0e7c2a3dbf46db2a53d55e3db6629f (patch)
tree4e35af03e2cd5a2ab5e74d0c08fef1ec10df9cca
parent34089599cdb55dbd568a27e87d2f893d85dc2962 (diff)
parentfb7470a2a6b4a35117edea4094d3d6dde3bd1637 (diff)
downloadmonzero-gui-9760886eff0e7c2a3dbf46db2a53d55e3db6629f.tar.gz
monzero-gui-9760886eff0e7c2a3dbf46db2a53d55e3db6629f.tar.xz
monzero-gui-9760886eff0e7c2a3dbf46db2a53d55e3db6629f.zip
Merge pull request #2834
fb7470a build: find zbar header on macOS (selsta)
-rw-r--r--monero-wallet-gui.pro8
1 files changed, 8 insertions, 0 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index d76b8c2a..68158bbb 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -231,6 +231,14 @@ CONFIG(WITH_SCANNER) {
LIBS += -lzbarjni -liconv
} else {
LIBS += -lzbar
+ macx {
+ ZBAR_DIR = $$system(brew --prefix zbar, lines, EXIT_CODE)
+ equals(EXIT_CODE, 0) {
+ INCLUDEPATH += $$ZBAR_DIR/include
+ } else {
+ INCLUDEPATH += /usr/local/include
+ }
+ }
}
} else {
message("Skipping camera scanner because of Incompatible Qt Version !")