Introduced new library for pglab code which I want to unit test.
Not everything can go into core because that would result in circular dependencies between core and pgsql.
This commit is contained in:
parent
b8505ce451
commit
ad9ed1b698
10 changed files with 98 additions and 21 deletions
|
|
@ -36,9 +36,7 @@ SOURCES += my_boost_assert_handler.cpp \
|
||||||
BackupFormatModel.cpp \
|
BackupFormatModel.cpp \
|
||||||
QueuedBackgroundTask.cpp \
|
QueuedBackgroundTask.cpp \
|
||||||
ExplainTreeModelItem.cpp \
|
ExplainTreeModelItem.cpp \
|
||||||
jsoncpp.cpp \
|
jsoncpp.cpp
|
||||||
ParamListJson.cpp \
|
|
||||||
ParamListModel.cpp
|
|
||||||
|
|
||||||
HEADERS += PasswordManager.h \
|
HEADERS += PasswordManager.h \
|
||||||
SqlLexer.h \
|
SqlLexer.h \
|
||||||
|
|
@ -48,26 +46,9 @@ HEADERS += PasswordManager.h \
|
||||||
QueuedBackgroundTask.h \
|
QueuedBackgroundTask.h \
|
||||||
Expected.h \
|
Expected.h \
|
||||||
ExplainTreeModelItem.h \
|
ExplainTreeModelItem.h \
|
||||||
ParamListJson.h \
|
|
||||||
ParamListModel.h \
|
|
||||||
json/json.h
|
json/json.h
|
||||||
|
|
||||||
unix {
|
unix {
|
||||||
target.path = /usr/lib
|
target.path = /usr/lib
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pgsql/release/ -lpgsql
|
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pgsql/debug/ -lpgsql
|
|
||||||
else:unix:!macx: LIBS += -L$$OUT_PWD/../pgsql/ -lpgsql
|
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../pgsql
|
|
||||||
DEPENDPATH += $$PWD/../pgsql
|
|
||||||
|
|
||||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/libpgsql.a
|
|
||||||
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/libpgsql.a
|
|
||||||
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/pgsql.lib
|
|
||||||
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib
|
|
||||||
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a
|
|
||||||
|
|
|
||||||
|
|
@ -169,3 +169,16 @@ else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PW
|
||||||
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib
|
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib
|
||||||
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a
|
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a
|
||||||
|
|
||||||
|
|
||||||
|
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pglablib/release/ -lpglablib
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pglablib/debug/ -lpglablib
|
||||||
|
else:unix:!macx: LIBS += -L$$OUT_PWD/../pglablib/ -lpglablib
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../pglablib
|
||||||
|
DEPENDPATH += $$PWD/../pglablib
|
||||||
|
|
||||||
|
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/release/libpglablib.a
|
||||||
|
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/debug/libpglablib.a
|
||||||
|
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/release/pglablib.lib
|
||||||
|
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/debug/pglablib.lib
|
||||||
|
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pglablib/libpglablib.a
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,8 @@ DEFINES += BOOST_ENABLE_ASSERT_HANDLER
|
||||||
|
|
||||||
SUBDIRS += core \
|
SUBDIRS += core \
|
||||||
pgsql \
|
pgsql \
|
||||||
pglab
|
pglab \
|
||||||
|
pglablib
|
||||||
|
|
||||||
CONFIG(debug, debug|release) {
|
CONFIG(debug, debug|release) {
|
||||||
SUBDIRS += tests
|
SUBDIRS += tests
|
||||||
|
|
|
||||||
6
pglablib/Pglablib.cpp
Normal file
6
pglablib/Pglablib.cpp
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
#include "Pglablib.h"
|
||||||
|
|
||||||
|
|
||||||
|
Pglablib::Pglablib()
|
||||||
|
{
|
||||||
|
}
|
||||||
12
pglablib/Pglablib.h
Normal file
12
pglablib/Pglablib.h
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
#ifndef PGLABLIB_H
|
||||||
|
#define PGLABLIB_H
|
||||||
|
|
||||||
|
|
||||||
|
class Pglablib
|
||||||
|
{
|
||||||
|
|
||||||
|
public:
|
||||||
|
Pglablib();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // PGLABLIB_H
|
||||||
64
pglablib/pglablib.pro
Normal file
64
pglablib/pglablib.pro
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
#-------------------------------------------------
|
||||||
|
#
|
||||||
|
# Project created by QtCreator 2017-12-13T17:36:43
|
||||||
|
#
|
||||||
|
#-------------------------------------------------
|
||||||
|
|
||||||
|
QT += widgets
|
||||||
|
|
||||||
|
TARGET = pglablib
|
||||||
|
TEMPLATE = lib
|
||||||
|
CONFIG += staticlib
|
||||||
|
|
||||||
|
# The following define makes your compiler emit warnings if you use
|
||||||
|
# any feature of Qt which has 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
|
||||||
|
|
||||||
|
INCLUDEPATH += C:\prog\include C:\Prog\include\pgsql C:\VSproj\boost32\include\boost-1_65_1
|
||||||
|
|
||||||
|
# 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 += \
|
||||||
|
Pglablib.cpp \
|
||||||
|
ParamListJson.cpp \
|
||||||
|
ParamListModel.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
Pglablib.h \
|
||||||
|
ParamListJson.h \
|
||||||
|
ParamListModel.h
|
||||||
|
unix {
|
||||||
|
target.path = /usr/lib
|
||||||
|
INSTALLS += target
|
||||||
|
}
|
||||||
|
|
||||||
|
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore
|
||||||
|
else:unix:!macx: LIBS += -L$$OUT_PWD/../core/ -lcore
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../core
|
||||||
|
DEPENDPATH += $$PWD/../core
|
||||||
|
|
||||||
|
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a
|
||||||
|
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a
|
||||||
|
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib
|
||||||
|
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib
|
||||||
|
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../core/libcore.a
|
||||||
|
|
||||||
|
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pgsql/release/ -lpgsql
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pgsql/debug/ -lpgsql
|
||||||
|
else:unix:!macx: LIBS += -L$$OUT_PWD/../pgsql/ -lpgsql
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/../pgsql
|
||||||
|
DEPENDPATH += $$PWD/../pgsql
|
||||||
|
|
||||||
|
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/libpgsql.a
|
||||||
|
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/libpgsql.a
|
||||||
|
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/pgsql.lib
|
||||||
|
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib
|
||||||
|
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a
|
||||||
Loading…
Add table
Add a link
Reference in a new issue