eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Adjusted project files for new boost version.

Browse source 
This should be handled differently the location of boost should not be baked into the project files.
This commit is contained in:
eelke 2018-09-18 20:24:54 +02:00
parent f5145f36ed
commit 780d912cd1
13 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/core.pro
View file

@ -8,23 +8,14 @@ QT -= gui
TARGET = core
TEMPLATE = lib
CONFIG += staticlib c++14
CONFIG += staticlib c++17
QMAKE_CXXFLAGS += /std:c++17
! include( ../common.pri ) {
error( "Couldn't find the common.pri file!" )
}
INCLUDEPATH += C:\prog\include \
C:\Prog\include\pgsql \
C:\VSproj\boost32\include\boost-1_65_1
INCLUDEPATH += C:\Prog\include\pgsql
DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX
#LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib
# 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.

4
core/my_boost_assert_handler.cpp
View file

@ -6,14 +6,14 @@ namespace boost
void assertion_failed(char const * expr, char const * function, char const * file, long line)
{
std::ostringstream out;
out << "Assertion failure int " << function << " " << file << ":" << line;
out << "Assertion failure int " << function << " " << file << ":" << line << "\n" << expr;
throw std::runtime_error(out.str());
}
void assertion_failed_msg(char const * expr, char const * msg, char const * function, char const * file, long line)
{
std::ostringstream out;
out << "Assertion failure int " << function << " " << file << ":" << line << "\n"<< msg;
out << "Assertion failure int " << function << " " << file << ":" << line << "\n" << msg << "\n" << expr;
throw std::runtime_error(out.str());
}
}