Fix qt unit test build on OSX
This commit is contained in:
parent
3809482e68
commit
123acb9a1b
2 changed files with 3 additions and 2 deletions
|
@ -66,7 +66,7 @@ Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
|
||||||
|
|
||||||
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
|
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
|
||||||
make -f Makefile.test
|
make -f Makefile.test
|
||||||
./Bitcoin-Qt
|
./bitcoin-qt_test
|
||||||
|
|
||||||
Every pull request is built for both Windows and Linux on a dedicated server,
|
Every pull request is built for both Windows and Linux on a dedicated server,
|
||||||
and unit and sanity tests are automatically run. The binaries produced may be
|
and unit and sanity tests are automatically run. The binaries produced may be
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET = bitcoin-qt
|
TARGET = bitcoin-qt
|
||||||
|
macx:TARGET = "Bitcoin-Qt"
|
||||||
VERSION = 0.8.0
|
VERSION = 0.8.0
|
||||||
INCLUDEPATH += src src/json src/qt
|
INCLUDEPATH += src src/json src/qt
|
||||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
||||||
|
@ -300,6 +301,7 @@ DEPENDPATH += src/qt/test
|
||||||
QT += testlib
|
QT += testlib
|
||||||
TARGET = bitcoin-qt_test
|
TARGET = bitcoin-qt_test
|
||||||
DEFINES += BITCOIN_QT_TEST
|
DEFINES += BITCOIN_QT_TEST
|
||||||
|
macx: CONFIG -= app_bundle
|
||||||
}
|
}
|
||||||
|
|
||||||
CODECFORTR = UTF-8
|
CODECFORTR = UTF-8
|
||||||
|
@ -381,7 +383,6 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
|
||||||
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
|
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
|
||||||
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
|
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
|
||||||
macx:ICON = src/qt/res/icons/bitcoin.icns
|
macx:ICON = src/qt/res/icons/bitcoin.icns
|
||||||
macx:TARGET = "Bitcoin-Qt"
|
|
||||||
macx:QMAKE_CFLAGS_THREAD += -pthread
|
macx:QMAKE_CFLAGS_THREAD += -pthread
|
||||||
macx:QMAKE_LFLAGS_THREAD += -pthread
|
macx:QMAKE_LFLAGS_THREAD += -pthread
|
||||||
macx:QMAKE_CXXFLAGS_THREAD += -pthread
|
macx:QMAKE_CXXFLAGS_THREAD += -pthread
|
||||||
|
|
Loading…
Reference in a new issue