mirror of
https://github.com/monero-project/monero-gui
synced 2025-01-25 09:57:28 +01:00
Merge pull request #2834
fb7470a
build: find zbar header on macOS (selsta)
This commit is contained in:
commit
9760886eff
@ -231,6 +231,14 @@ CONFIG(WITH_SCANNER) {
|
|||||||
LIBS += -lzbarjni -liconv
|
LIBS += -lzbarjni -liconv
|
||||||
} else {
|
} else {
|
||||||
LIBS += -lzbar
|
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 {
|
} else {
|
||||||
message("Skipping camera scanner because of Incompatible Qt Version !")
|
message("Skipping camera scanner because of Incompatible Qt Version !")
|
||||||
|
Loading…
Reference in New Issue
Block a user