diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-11 10:48:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-11 10:48:35 +0200 |
| commit | f98bd4eae1bc6d57c27cc13d0495941f15eddf19 (patch) | |
| tree | e007e74473c21106e4cae8564e7f2f9982cd1b3f /src | |
| parent | 023690c0f24a06853bb860db032a1ff67978ee74 (diff) | |
| parent | d5fd094569e74595af18d42d2aa06738304b715b (diff) | |
| download | bitcoin-f98bd4eae1bc6d57c27cc13d0495941f15eddf19.tar.xz | |
Merge pull request #5073
d5fd094 build: fix qt test build when libprotobuf is in a non-standard path (Cory Fields)
a7d1f03 build: fix dynamic boost check when --with-boost= is used (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.qttest.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 2cba5b7e1e..23375bef82 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -13,7 +13,7 @@ TEST_QT_H = \ qt/test/paymentservertests.h qt_test_test_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ - $(QT_INCLUDES) $(QT_TEST_INCLUDES) + $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) qt_test_test_bitcoin_qt_SOURCES = \ qt/test/test_main.cpp \ |