project file cleanup

Moving system dependent parts into local.pri which is not tracked and supply local.pri.sample as a template for developers to adjust for their local system.
This commit is contained in:
Eelke Klein 2019-03-24 08:53:22 +01:00
parent 0f37f74dda
commit e7bfaeff9a
9 changed files with 31 additions and 28 deletions

2
.gitignore vendored
View file

@ -2,7 +2,7 @@
build/*
*.kdev4
.kdev4/*
local.pri
DIST/
*.autosave
srcdoc/

View file

@ -1,7 +1,10 @@
INCLUDEPATH += C:\prog\include C:\prog\include\pgsql C:\VSproj\boost\include\boost-1_68
! include( ./local.pri ) {
error( "Use local.pri.sample to create your own local.pri" )
}
LIBS += -LC:\VSproj\boost\lib -LC:/PROG/LIB -lws2_32 -llibpq
LIBS += -lws2_32 -llibpq
CONFIG += c++17
QMAKE_CXXFLAGS += /std:c++17
# The following define makes your compiler emit warnings if you use

View file

@ -9,7 +9,7 @@ QT += sql
TARGET = core
TEMPLATE = lib
CONFIG += staticlib c++17
CONFIG += staticlib
! include( ../common.pri ) {
error( "Couldn't find the common.pri file!" )

View file

@ -8,15 +8,7 @@ QT += widgets
TARGET = ctk
TEMPLATE = lib
CONFIG += staticlib c++14
QMAKE_CXXFLAGS += /std:c++17
INCLUDEPATH += C:\prog\include \
C:\Prog\include\pgsql \
C:\VSproj\boost32\include
DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
CONFIG += staticlib
# The following define makes your compiler emit warnings if you use

17
local.pri.sample Normal file
View file

@ -0,0 +1,17 @@
# Need paths here to find following library headers
# - botan
# - boost
# - libpq
# ???
INCLUDEPATH += c:/prog/include
INCLUDEPATH += c:/prog/include/pgsql
INCLUDEPATH += c:/VSproj/boost/include/boost-1_68
# Need paths here to find library files for
# - botan
# - boost
# - libpq
#
LIBS += -L\VSproj\boost\lib -L/PROG/LIB
GOOGLETEST_DIR = c:/prog/googletest

View file

@ -4,7 +4,6 @@
#
#-------------------------------------------------
CONFIG += c++17
QT += core gui concurrent
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql
@ -17,11 +16,7 @@ TEMPLATE = app
error( "Couldn't find the common.pri file!" )
}
INCLUDEPATH += C:\Prog\include\pgsql
DEFINES += _WIN32_WINNT=0x0501
#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib
#LIBS += -LC:\VSproj\boost32\lib -LC:/PROG/LIB -lws2_32 -llibpq
win32:RC_ICONS += pglab.ico

View file

@ -4,7 +4,7 @@
#
#-------------------------------------------------
CONFIG += staticlib c++17
CONFIG += staticlib
QT += core
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql

View file

@ -4,7 +4,7 @@ error( "Couldn't find the common.pri file!" )
include(gtest_dependency.pri)
TEMPLATE = app
CONFIG += console c++17
CONFIG += console
CONFIG -= app_bundle
CONFIG += thread
CONFIG += qt

View file

@ -1,20 +1,16 @@
! include( ../../common.pri ) {
error( "Couldn't find the common.pri file!" )
}
include(gtest_dependency.pri)
TEMPLATE = app
CONFIG += console c++17
CONFIG += console
CONFIG -= app_bundle
CONFIG += thread
CONFIG += qt
QT += core widgets
QMAKE_CXXFLAGS += /std:c++17
! include( ../../common.pri ) {
error( "Couldn't find the common.pri file!" )
}
HEADERS +=
SOURCES += main.cpp \