Switching to linux for development of pglab.

Switched from qmake to cmake. Code changes to make it compile.
2017-08-23 08:10:01 +02:00 · 2017-08-23 08:10:01 +02:00 · 04723a289b
commit 04723a289b
parent dd9906dbd8
142 changed files with 124 additions and 83 deletions
--- a/pglab/src.pro
+++ b/pglab/src.pro
@ -0,0 +1,154 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-11-11T09:17:13
+#
+#-------------------------------------------------
+
+CONFIG   += c++14
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
+
+TARGET = pglab
+TEMPLATE = app
+
+INCLUDEPATH += C:\prog\include C:\Prog\boost\include\boost-1_64
+DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
+#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib
+LIBS += -LC:/MINGW/LIB -LC:/PROG/LIB -lws2_32 -lpq
+
+debug {
+LIBS += c:/prog/lib/botand_imp.lib
+}
+
+release {
+# LIBS += c:\prog\lib\botan.lib
+}
+
+win32:RC_ICONS += pglab.ico
+
+SOURCES += main.cpp\
+    sqlparser.cpp \
+    PgsqlConn.cpp \
+    QueryResultModel.cpp \
+    sqlhighlighter.cpp \
+    jsoncpp.cpp \
+    QueryExplainModel.cpp \
+    ExplainTreeModelItem.cpp \
+	ASyncDBConnection.cpp \
+    tsqueue.cpp \
+    win32event.cpp \
+    waithandlelist.cpp \
+    DatabaseWindow.cpp \
+	ConnectionManagerWindow.cpp \
+	ConnectionListModel.cpp \
+	ConnectionConfig.cpp \
+    BackupRestore.cpp \
+    QueryTab.cpp \
+    stopwatch.cpp \
+    util.cpp \
+    DatabaseInspectorWidget.cpp \
+	PgType.cpp \
+    PgsqlDatabaseCatalogue.cpp \
+	PgTypeContainer.cpp \
+    TuplesResultWidget.cpp \
+    PgNamespace.cpp \
+    PgClass.cpp \
+    BackupDialog.cpp \
+    TypeSelectionItemModel.cpp \
+    MasterController.cpp \
+    ParamTypeDelegate.cpp \
+    OpenDatabase.cpp \
+    ParamListModel.cpp \
+    MainWindow.cpp \
+    SqlSyntaxHighlighter.cpp \
+    ServerWindow.cpp \
+    ASyncWindow.cpp \
+    DatabasesTableModel.cpp \
+    PgDatabase.cpp \
+    PgDatabaseContainer.cpp \
+    Pgsql_Params.cpp \
+    RolesTableModel.cpp \
+    PgAuthId.cpp \
+    PgAuthIdContainer.cpp \
+    Pgsql_Result.cpp \
+    Pgsql_Row.cpp \
+    Pgsql_Value.cpp \
+    ConnectionList.cpp \
+    ProcessStdioWidget.cpp
+
+HEADERS  += \
+    sqlparser.h \
+    PgsqlConn.h \
+    QueryResultModel.h \
+    sqlhighlighter.h \
+    QueryExplainModel.h \
+    ExplainTreeModelItem.h \
+	ASyncDBConnection.h \
+    tsqueue.h \
+    win32event.h \
+    waithandlelist.h \
+    DatabaseWindow.h \
+	ConnectionManagerWindow.h \
+	ConnectionListModel.h \
+	ConnectionConfig.h \
+    QueryTab.h \
+    stopwatch.h \
+    util.h \
+    DatabaseInspectorWidget.h \
+	PgType.h \
+    PgsqlDatabaseCatalogue.h \
+	PgTypeContainer.h \
+    TuplesResultWidget.h \
+    PgNamespace.h \
+    PgClass.h \
+    BackupDialog.h \
+    TypeSelectionItemModel.h \
+    MasterController.h \
+    ParamTypeDelegate.h \
+    OpenDatabase.h \
+    ParamListModel.h \
+    MainWindow.h \
+    SqlSyntaxHighlighter.h \
+    ServerWindow.h \
+    ASyncWindow.h \
+    DatabasesTableModel.h \
+    PgDatabase.h \
+    PgDatabaseContainer.h \
+    PgContainer.h \
+    Pgsql_Params.h \
+    Pgsql_declare.h \
+    RolesTableModel.h \
+    PgAuthId.h \
+    PgAuthIdContainer.h \
+    Pgsql_Result.h \
+    Pgsql_Row.h \
+    Pgsql_Value.h \
+    ConnectionList.h \
+    ProcessStdioWidget.h
+
+FORMS    += mainwindow.ui \
+    DatabaseWindow.ui \
+	ConnectionManagerWindow.ui \
+    DatabaseInspectorWidget.ui \
+    TuplesResultWidget.ui \
+    QueryTab.ui \
+    BackupDialog.ui \
+    ServerWindow.ui \
+    ProcessStdioWidget.ui
+
+RESOURCES += \
+    resources.qrc
+
+#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01
+
+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
+
+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