From e978b6dee1430c281088500030d2cfd0cf34fc1d Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 10 Mar 2014 21:19:24 +0100 Subject: [PATCH] Central build configuration * config.pri: Build configuration version * library.pri project library dependencies * build.pri: compiler/qmake configuration refs #145 --- build.pri | 22 +++++++++++++ client.pro | 31 ++++++------------- config.pri | 29 +++++++++++++++++ libraries.pri | 19 ++++++++++++ samples/blackcore/sample_blackcore.pro | 11 ++++--- samples/blackgui/sample_blackgui.pro | 11 +++---- samples/blackmisc/sample_blackmisc.pro | 10 ++++-- .../blackmiscdbus/sample_blackmisc_dbus.pro | 9 ++++-- .../sample_quantities_aviation.pro | 10 +++--- .../blackmiscvectorgeo/sample_vector_geo.pro | 10 ++++-- samples/cli_client/sample_cli_client.pro | 11 ++++--- samples/hotkey/sample_hotkey.pro | 12 ++++--- samples/interpolator/sample_interpolator.pro | 10 ++++-- samples/plugin/sample_plugin.pro | 13 +++++--- samples/pluginmgr/sample_pluginmgr.pro | 11 ++++--- samples/voiceclient/sample_voice_client.pro | 11 ++++--- src/blackcore/blackcore.pro | 10 +++--- src/blackgui/blackgui.pro | 8 ++++- src/blackmisc/blackmisc.pro | 5 +++ src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro | 11 ++++--- src/blacksound/blacksound.pro | 7 ++++- tests/blackcore/test_blackcore.pro | 11 ++++--- tests/blackmisc/test_blackmisc.pro | 10 ++++-- 23 files changed, 202 insertions(+), 90 deletions(-) create mode 100644 build.pri create mode 100644 config.pri create mode 100644 libraries.pri diff --git a/build.pri b/build.pri new file mode 100644 index 000000000..4b733eb0b --- /dev/null +++ b/build.pri @@ -0,0 +1,22 @@ +########################### +# QMake options +########################### + +CONFIG += qt +CONFIG += warn_on +CONFIG += silent +CONFIG += c++11 + +########################### +# Debug/Release +########################### + +win32 { + +} +else { + VER_MAJ = $${BLACK_VER_MAJ} + VER_MIN = $${BLACK_VER_MIN} + VER_PAT = $${BLACK_VER_PAT} + VERSION = $${BLACK_VERSION} +} diff --git a/client.pro b/client.pro index 77dca7523..8c0292413 100644 --- a/client.pro +++ b/client.pro @@ -1,41 +1,30 @@ -TEMPLATE = subdirs +include (config.pri) +TEMPLATE = subdirs CONFIG += ordered -include (externals.pri) - -WITH_BLACKMISC = ON -WITH_BLACKCORE = ON -WITH_BLACKGUI = ON -WITH_BLACKSIM = ON -WITH_BLACKSOUND = ON -WITH_SAMPLES = ON -WITH_UNITTESTS = ON - -#WITH_DOXYGEN = ON - -equals(WITH_BLACKMISC, ON) { +contains(BLACK_CONFIG, BlackMisc) { SUBDIRS += src/blackmisc # SUBDIRS += src/blackmisc_cpp2xml } -equals(WITH_BLACKSOUND, ON) { +contains(BLACK_CONFIG, BlackSound) { SUBDIRS += src/blacksound } -equals(WITH_BLACKCORE, ON) { +contains(BLACK_CONFIG, BlackCore) { SUBDIRS += src/blackcore } -equals(WITH_BLACKGUI, ON) { +contains(BLACK_CONFIG, BlackGui) { SUBDIRS += src/blackgui } -equals(WITH_BLACKSIM, ON) { +contains(BLACK_CONFIG, BlackSim) { SUBDIRS += src/blacksim } -equals(WITH_SAMPLES, ON) { +contains(BLACK_CONFIG, Samples) { SUBDIRS += samples/cli_client/sample_cli_client.pro SUBDIRS += samples/interpolator/sample_interpolator.pro SUBDIRS += samples/plugin/sample_plugin.pro @@ -51,11 +40,11 @@ equals(WITH_SAMPLES, ON) { SUBDIRS += samples/hotkey/sample_hotkey.pro } -equals(WITH_UNITTESTS, ON) { +contains(BLACK_CONFIG, Unittests) { SUBDIRS += tests/blackmisc/test_blackmisc.pro SUBDIRS += tests/blackcore/test_blackcore.pro } -equals(WITH_DOXYGEN, ON) { +contains(BLACK_CONFIG, Doxygen) { SUBDIRS += docs/doxygen.pro } diff --git a/config.pri b/config.pri new file mode 100644 index 000000000..78c230f5a --- /dev/null +++ b/config.pri @@ -0,0 +1,29 @@ +# Copyright (C) 2013 VATSIM Community / authors +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +### Version + +BLACK_VER_MAJ = 0 +BLACK_VER_MIN = 4 +BLACK_VER_PAT = 0 +BLACK_VERSION = $${BLACK_VER_MAJ}.$${BLACK_VER_MIN}.$${BLACK_VERSION} + +########################### +# Install paths +########################### + + +########################### +# Build configuration +########################### + +BLACK_CONFIG += BlackMisc +BLACK_CONFIG += BlackCore +BLACK_CONFIG += BlackGui +BLACK_CONFIG += BlackSound +BLACK_CONFIG += BlackSim +BLACK_CONFIG += Samples +BLACK_CONFIG += Unittests +#BLACK_CONFIG += Doxygen diff --git a/libraries.pri b/libraries.pri new file mode 100644 index 000000000..d296ba18f --- /dev/null +++ b/libraries.pri @@ -0,0 +1,19 @@ +include (externals.pri) + +LIBS *= -L../../lib + +blackgui { + LIBS += -lblackgui +} + +blackcore { + LIBS += -lblackcore -lvatlib +} + +blacksound { + LIBS += -lblacksound +} + +blackmisc { + LIBS += -lblackmisc +} diff --git a/samples/blackcore/sample_blackcore.pro b/samples/blackcore/sample_blackcore.pro index f73fa5137..4b5d7cdb3 100644 --- a/samples/blackcore/sample_blackcore.pro +++ b/samples/blackcore/sample_blackcore.pro @@ -1,19 +1,18 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core dbus network xml multimedia TARGET = sample_blackcore TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blacksound blackcore DEPENDPATH += . ../../src/blackmisc ../../src/blacksound ../../src/blackcore INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc -LIBS += -lvatlib -lSimConnect - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blacksound.lib \ ../../lib/blackcore.lib @@ -27,3 +26,5 @@ HEADERS += *.h SOURCES += *.cpp OTHER_FILES += readme.txt + +include (../../libraries.pri) diff --git a/samples/blackgui/sample_blackgui.pro b/samples/blackgui/sample_blackgui.pro index 6b70c7f47..cf0950cc9 100644 --- a/samples/blackgui/sample_blackgui.pro +++ b/samples/blackgui/sample_blackgui.pro @@ -1,4 +1,5 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core dbus gui network xml multimedia greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -9,17 +10,13 @@ TEMPLATE = app SOURCES += *.cpp HEADERS += *.h FORMS += *.ui -CONFIG += c++11 +CONFIG += blackmisc blacksound blackcore blackgui DEPENDPATH += . ../../src/blackmisc ../../src/blackgui ../../src/blacksound ../../src/blackcore INCLUDEPATH += . ../../src DESTDIR = ../../bin -LIBS += -L../../lib -lblackcore -lblackgui -lblacksound -lblackmisc -LIBS += -lvatlib -LIBS += -lSimConnect - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackgui.lib \ ../../lib/blacksound.lib \ @@ -31,3 +28,5 @@ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a OTHER_FILES += *.qss + +include (../../libraries.pri) diff --git a/samples/blackmisc/sample_blackmisc.pro b/samples/blackmisc/sample_blackmisc.pro index f1e9e71f9..c8905e11f 100644 --- a/samples/blackmisc/sample_blackmisc.pro +++ b/samples/blackmisc/sample_blackmisc.pro @@ -1,16 +1,18 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_blackmisc TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc DEPENDPATH += . ../../src/blackmisc INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a @@ -20,3 +22,5 @@ HEADERS += *.h SOURCES += *.cpp OTHER_FILES += + +include (../../libraries.pri) diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/sample_blackmisc_dbus.pro index 0bd54e1b7..08f704d1e 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/sample_blackmisc_dbus.pro @@ -1,15 +1,18 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_blackmisc_dbus TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore DEPENDPATH += . ../../src/blackmisc ../../src/blackcore INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackcore -lblackmisc win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ @@ -21,3 +24,5 @@ HEADERS += *.h SOURCES += *.cpp OTHER_FILES += *.txt *.xml + +include (../../libraries.pri) diff --git a/samples/blackmiscquantities/sample_quantities_aviation.pro b/samples/blackmiscquantities/sample_quantities_aviation.pro index 1c01eed1a..e6d2f2d65 100644 --- a/samples/blackmiscquantities/sample_quantities_aviation.pro +++ b/samples/blackmiscquantities/sample_quantities_aviation.pro @@ -1,16 +1,18 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_quantities_aviation TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc DEPENDPATH += . ../../src/blackmisc INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a @@ -19,4 +21,4 @@ DESTDIR = ../../bin HEADERS += *.h SOURCES += *.cpp -OTHER_FILES += +include (../../libraries.pri) diff --git a/samples/blackmiscvectorgeo/sample_vector_geo.pro b/samples/blackmiscvectorgeo/sample_vector_geo.pro index 6f9066bf1..fb8d943fc 100644 --- a/samples/blackmiscvectorgeo/sample_vector_geo.pro +++ b/samples/blackmiscvectorgeo/sample_vector_geo.pro @@ -1,16 +1,18 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_vector_geo -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore TEMPLATE = app DEPENDPATH += . ../../src INCLUDEPATH += . ../../src -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a @@ -18,3 +20,5 @@ DESTDIR = ../../bin SOURCES += *.cpp HEADERS += *.h + +include (../../libraries.pri) diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro index c97e1762d..b3587e31b 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cli_client/sample_cli_client.pro @@ -1,12 +1,14 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core dbus network TARGET = sample_cli_client TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -14,12 +16,11 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc -LIBS += -lvatlib - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a DESTDIR = ../../bin + +include (../../libraries.pri) diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/sample_hotkey.pro index a11647927..5ecc7bd78 100644 --- a/samples/hotkey/sample_hotkey.pro +++ b/samples/hotkey/sample_hotkey.pro @@ -1,25 +1,27 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core gui dbus network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = sample_hotkey -CONFIG += c++11 -CONFIG -= app_bundle TEMPLATE = app +CONFIG -= app_bundle +CONFIG += blackmisc blackcore + DEPENDPATH += . ../../src INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackcore -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a DESTDIR = ../../bin + +include (../../libraries.pri) diff --git a/samples/interpolator/sample_interpolator.pro b/samples/interpolator/sample_interpolator.pro index df49c73c5..9ae80d31f 100644 --- a/samples/interpolator/sample_interpolator.pro +++ b/samples/interpolator/sample_interpolator.pro @@ -1,8 +1,12 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = sample_interpolator -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore TEMPLATE = app @@ -14,11 +18,11 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp -LIBS += -L../../lib -lblackcore -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a DESTDIR = ../../bin + +include (../../libraries.pri) diff --git a/samples/plugin/sample_plugin.pro b/samples/plugin/sample_plugin.pro index 7aeb4abb3..dfacf7715 100644 --- a/samples/plugin/sample_plugin.pro +++ b/samples/plugin/sample_plugin.pro @@ -1,9 +1,15 @@ +include (../../config.pri) +include (../../build.pri) + QT += core QT -= gui TARGET = sample_plugin TEMPLATE = lib -CONFIG += plugin c++11 + +CONFIG += plugin +CONFIG += blackmisc blackcore + DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -11,12 +17,9 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a DESTDIR = ../../bin - - +include (../../libraries.pri) diff --git a/samples/pluginmgr/sample_pluginmgr.pro b/samples/pluginmgr/sample_pluginmgr.pro index c5758be6b..756d55799 100644 --- a/samples/pluginmgr/sample_pluginmgr.pro +++ b/samples/pluginmgr/sample_pluginmgr.pro @@ -1,19 +1,21 @@ +include (../../config.pri) +include (../../build.pri) + QT += core QT -= gui TARGET = sample_pluginmgr TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore DEPENDPATH += . ../../src INCLUDEPATH += . ../../src SOURCES += *.cpp -LIBS += -L../../lib -lblackcore -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ @@ -21,5 +23,4 @@ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ DESTDIR = ../../bin - - +include (../../libraries.pri) diff --git a/samples/voiceclient/sample_voice_client.pro b/samples/voiceclient/sample_voice_client.pro index 1e73953e2..8d1e6b4ac 100644 --- a/samples/voiceclient/sample_voice_client.pro +++ b/samples/voiceclient/sample_voice_client.pro @@ -1,4 +1,5 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core dbus network multimedia QT -= gui @@ -6,8 +7,9 @@ QT -= gui TARGET = sample_voice_client TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blacksound blackcore DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -15,9 +17,6 @@ INCLUDEPATH += . ../../src SOURCES += *.cpp HEADERS += *.h -LIBS += -L../../lib -lblackcore -lblacksound -lblackmisc -LIBS += -lvatlib - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib \ ../../lib/blacksound.lib @@ -25,3 +24,5 @@ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a \ ../../lib/libblacksound.a DESTDIR = ../../bin + +include (../../libraries.pri) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index a2e92fe33..294a20317 100644 --- a/src/blackcore/blackcore.pro +++ b/src/blackcore/blackcore.pro @@ -1,4 +1,5 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) # GUI is required for the matrix classes # Network for host info etc. @@ -6,13 +7,12 @@ QT += network dbus xml multimedia TARGET = blackcore TEMPLATE = lib -CONFIG += staticlib c++11 +CONFIG += staticlib +CONFIG += blackmisc INCLUDEPATH += .. DEPENDPATH += . .. -LIBS += -L../../lib -lblacksound -lblackmisc -lSimConnect - # linux-g++* { QMAKE_CXXFLAGS += -std=c++0x } # PRECOMPILED_HEADER = stdpch.h @@ -51,3 +51,5 @@ else: PRE_TARGETDEPS += ../../lib/libblackmisc.a ../../lib/libblack DESTDIR = ../../lib OTHER_FILES += readme.txt *.xml + +include (../../libraries.pri) diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index a5f8e1d5e..d07da76e6 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -1,10 +1,14 @@ +include (../../config.pri) +include (../../build.pri) + QT += network dbus gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = blackgui TEMPLATE = lib -CONFIG += staticlib c++11 +CONFIG += staticlib +CONFIG += blackmisc INCLUDEPATH += .. DEPENDPATH += . .. @@ -34,3 +38,5 @@ DESTDIR = ../../lib OTHER_FILES += RESOURCES += blackgui.qrc + +include (../../libraries.pri) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 5b609124e..3b25870bb 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -1,3 +1,6 @@ +include (../../config.pri) +include (../../build.pri) + QT += network dbus TARGET = blackmisc @@ -24,3 +27,5 @@ HEADERS += *.h SOURCES += *.cpp DESTDIR = ../../lib OTHER_FILES += $$TRANSLATIONS readme.txt + +include (../../libraries.pri) diff --git a/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro b/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro index acb44a02f..469a5a7e7 100644 --- a/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro +++ b/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro @@ -1,15 +1,16 @@ +include (../../config.pri) +include (../../build.pri) + QT += core dbus network TARGET = blackmisc_cpp2xml TEMPLATE = lib -CONFIG += plugin c++11 +CONFIG += plugin +CONFIG += blackmisc DEPENDPATH += . ../../src/blackmisc INCLUDEPATH += . ../../src - -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a @@ -17,3 +18,5 @@ DESTDIR = ../../bin HEADERS += *.h SOURCES += *.cpp + +include (../../libraries.pri) diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro index 45b57ee99..2a502c899 100644 --- a/src/blacksound/blacksound.pro +++ b/src/blacksound/blacksound.pro @@ -1,8 +1,11 @@ +include (../../config.pri) +include (../../build.pri) + QT += network dbus gui multimedia TARGET = blacksound TEMPLATE = lib -CONFIG += staticlib c++11 +CONFIG += staticlib INCLUDEPATH += .. DEPENDPATH += . .. @@ -30,3 +33,5 @@ else: COPY = cp -r QMAKE_POST_LINK += $$COPY $$shell_path($$PWD/sounds) \ $$shell_path($$OUT_PWD/../../bin/sounds) + +include (../../libraries.pri) diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/test_blackcore.pro index 441dc109f..10a666321 100644 --- a/tests/blackcore/test_blackcore.pro +++ b/tests/blackcore/test_blackcore.pro @@ -1,12 +1,14 @@ -include (../../externals.pri) +include (../../config.pri) +include (../../build.pri) QT += core testlib dbus network TARGET = test_blackcore TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc blackcore DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -14,12 +16,11 @@ INCLUDEPATH += . ../../src HEADERS += *.h SOURCES += *.cpp -LIBS += -L../../lib -lblackcore -lblackmisc -LIBS += -lvatlib - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib \ ../../lib/blackcore.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a DESTDIR = ../../bin + +include (../../libraries.pri) diff --git a/tests/blackmisc/test_blackmisc.pro b/tests/blackmisc/test_blackmisc.pro index c046573f5..b36c2d31c 100644 --- a/tests/blackmisc/test_blackmisc.pro +++ b/tests/blackmisc/test_blackmisc.pro @@ -1,10 +1,14 @@ +include (../../config.pri) +include (../../build.pri) + QT += core testlib dbus network TARGET = test_blackmisc TEMPLATE = app -CONFIG += console c++11 +CONFIG += console CONFIG -= app_bundle +CONFIG += blackmisc DEPENDPATH += . ../../src INCLUDEPATH += . ../../src @@ -12,9 +16,9 @@ INCLUDEPATH += . ../../src HEADERS += *.h SOURCES += *.cpp -LIBS += -L../../lib -lblackmisc - win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib else: PRE_TARGETDEPS += ../../lib/libblackmisc.a DESTDIR = ../../bin + +include (../../libraries.pri)