mirror of
https://github.com/romixlab/qmsgpack.git
synced 2025-06-25 01:21:33 +02:00
Merge pull request #35 from KonstantinRitt/mr/pri
Modernize qmake project files and fix some build issues
This commit is contained in:
Roman Isaikin
GitHub
@ -1,7 +1,5 @@
|
||||
QT += core
|
||||
|
||||
DEFINES += MSGPACK_MAKE_LIB
|
||||
|
||||
INCLUDEPATH += $$PWD/src
|
||||
|
||||
SOURCES += \
|
||||
@ -26,6 +24,10 @@ HEADERS += \
|
||||
$$PWD/src/stream/time.h \
|
||||
$$PWD/src/stream/geometry.h
|
||||
|
||||
qtHaveModule(gui) {
|
||||
QT += gui
|
||||
}
|
||||
|
||||
qtHaveModule(location) {
|
||||
QT += location
|
||||
|
||||
|
||||
43
src/src.pro
43
src/src.pro
@ -1,39 +1,15 @@
|
||||
QT += core gui
|
||||
|
||||
TARGET = qmsgpack
|
||||
CONFIG -= app_bundle
|
||||
VER_MAJ = 0
|
||||
VER_MIN = 1
|
||||
VER_PAT = 0
|
||||
|
||||
TEMPLATE = lib
|
||||
DEFINES += MSGPACK_MAKE_LIB
|
||||
DESTDIR = $$PWD/../bin
|
||||
QMAKE_CXXFLAGS += -fPIC
|
||||
DESTDIR = $$shadowed($$PWD/../bin)
|
||||
TARGET = $$qtLibraryTarget($$TARGET)
|
||||
VERSION = $$join($$list($$VER_MAJ $$VER_MIN $$VER_PAT), .)
|
||||
|
||||
CONFIG += debug_and_release
|
||||
CONFIG(debug, debug|release) {
|
||||
TARGET = $$join(TARGET,,,d)
|
||||
}
|
||||
|
||||
|
||||
SOURCES += msgpack.cpp \
|
||||
msgpackcommon.cpp \
|
||||
private/pack_p.cpp \
|
||||
private/unpack_p.cpp \
|
||||
private/qt_types_p.cpp \
|
||||
msgpackstream.cpp \
|
||||
stream/time.cpp \
|
||||
stream/geometry.cpp
|
||||
|
||||
HEADERS += \
|
||||
msgpack.h \
|
||||
private/pack_p.h \
|
||||
private/unpack_p.h \
|
||||
endianhelper.h \
|
||||
msgpackcommon.h \
|
||||
msgpack_export.h \
|
||||
private/qt_types_p.h \
|
||||
msgpackstream.h \
|
||||
stream/time.h \
|
||||
stream/geometry.h
|
||||
include(../qmsgpack.pri)
|
||||
|
||||
HEADERS_INSTALL = \
|
||||
msgpack.h \
|
||||
@ -43,13 +19,10 @@ HEADERS_INSTALL = \
|
||||
msgpackstream.h \
|
||||
|
||||
STREAM_HEADERS_INSTALL = \
|
||||
stream/geometry.h \
|
||||
stream/time.h
|
||||
|
||||
qtHaveModule(location) {
|
||||
QT += location
|
||||
|
||||
SOURCES += stream/location.cpp
|
||||
HEADERS += stream/location.h
|
||||
STREAM_HEADERS_INSTALL += stream/location.h
|
||||
}
|
||||
|
||||
|
||||
@ -1,22 +1,7 @@
|
||||
#-------------------------------------------------
|
||||
#
|
||||
# Project created by QtCreator 2014-09-26T19:10:31
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += testlib
|
||||
|
||||
QT -= gui
|
||||
|
||||
TARGET = mixed_test
|
||||
CONFIG += console
|
||||
CONFIG -= app_bundle
|
||||
|
||||
TEMPLATE = app
|
||||
|
||||
INCLUDEPATH += ../../src
|
||||
LIBS += -lqmsgpack
|
||||
QT += testlib
|
||||
CONFIG += testcase
|
||||
|
||||
include(../tests.pri)
|
||||
|
||||
SOURCES += mixed_test.cpp
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
#-------------------------------------------------
|
||||
#
|
||||
# Project created by QtCreator 2014-09-20T15:17:37
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += testlib
|
||||
|
||||
QT -= gui
|
||||
|
||||
TARGET = pack_test
|
||||
CONFIG += console
|
||||
CONFIG -= app_bundle
|
||||
|
||||
TEMPLATE = app
|
||||
|
||||
LIBS += -lqmsgpack
|
||||
INCLUDEPATH += ../../src
|
||||
|
||||
|
||||
SOURCES += pack_test.cpp
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
7
tests/pack/pack.pro
Normal file
7
tests/pack/pack.pro
Normal file
@ -0,0 +1,7 @@
|
||||
TARGET = pack_test
|
||||
QT += testlib
|
||||
CONFIG += testcase
|
||||
|
||||
include(../tests.pri)
|
||||
|
||||
SOURCES += pack_test.cpp
|
||||
7
tests/qttypes/qttypes.pro
Normal file
7
tests/qttypes/qttypes.pro
Normal file
@ -0,0 +1,7 @@
|
||||
TARGET = qttypes_test
|
||||
QT += testlib
|
||||
CONFIG += testcase
|
||||
|
||||
include(../tests.pri)
|
||||
|
||||
SOURCES += qttypes_test.cpp
|
||||
@ -1,33 +1,7 @@
|
||||
#-------------------------------------------------
|
||||
#
|
||||
# Project created by QtCreator 2017-07-10T14:58:18
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += testlib
|
||||
|
||||
QT -= gui
|
||||
|
||||
TARGET = tst_streamtest
|
||||
CONFIG += console
|
||||
CONFIG -= app_bundle
|
||||
|
||||
TEMPLATE = app
|
||||
TARGET = stream_test
|
||||
QT += testlib
|
||||
CONFIG += testcase
|
||||
|
||||
include(../tests.pri)
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
# any feature of Qt which as been marked as deprecated (the exact warnings
|
||||
# depend on your compiler). Please consult the documentation of the
|
||||
# deprecated API in order to know how to port your code away from it.
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
# You can also make your code fail to compile if you use deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
|
||||
SOURCES += \
|
||||
stream_test.cpp
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
SOURCES += stream_test.cpp
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
INCLUDEPATH += ../../src
|
||||
LIBS += -L"$$PWD/../bin" -lqmsgpackd
|
||||
LIBS += -L$$shadowed($$PWD/../bin) -l$$qtLibraryTarget(qmsgpack)
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
TEMPLATE = subdirs
|
||||
|
||||
SUBDIRS += \
|
||||
stream
|
||||
pack \
|
||||
unpack \
|
||||
mixed \
|
||||
stream \
|
||||
qttypes
|
||||
|
||||
@ -1,21 +1,7 @@
|
||||
#-------------------------------------------------
|
||||
#
|
||||
# Project created by QtCreator 2014-09-25T10:25:22
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += testlib
|
||||
|
||||
QT -= gui
|
||||
|
||||
TARGET = unpack_test
|
||||
CONFIG += console
|
||||
CONFIG -= app_bundle
|
||||
|
||||
TEMPLATE = app
|
||||
include($$PWD/../../qmsgpack.pri)
|
||||
INCLUDEPATH += ../../src
|
||||
QT += testlib
|
||||
CONFIG += testcase
|
||||
|
||||
include(../tests.pri)
|
||||
|
||||
SOURCES += unpack_test.cpp
|
||||
DEFINES += SRCDIR=\\\"$$PWD/\\\"
|
||||
|
||||
Reference in New Issue
Block a user