walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

dmake: add include path '../externals' to lib.pri in case the pcre.h is placed there.

This commit is contained in:
Daniel Marjamäki 2010-12-12 17:26:13 +01:00
parent 2d3865a671
commit 48241c81f8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cli.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = cppcheck TARGET = cppcheck
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . ../lib ../externals INCLUDEPATH += . ../lib
OBJECTS_DIR = temp OBJECTS_DIR = temp
CONFIG += warn_on CONFIG += warn_on
CONFIG -= qt app_bundle CONFIG -= qt app_bundle

1
lib/lib.pri
View File

@ -1,6 +1,7 @@
# no manual edits - this file is autogenerated by dmake # no manual edits - this file is autogenerated by dmake
LIBS += -L../externals -lpcre LIBS += -L../externals -lpcre
INCLUDEPATH += ../externals
HEADERS += $$PWD/check.h \ HEADERS += $$PWD/check.h \
$$PWD/checkautovariables.h \ $$PWD/checkautovariables.h \
$$PWD/checkbufferoverrun.h \ $$PWD/checkbufferoverrun.h \

7
tools/dmake.cpp
View File

@ -138,7 +138,8 @@ int main(int argc, char **argv)
if (fout1.is_open()) if (fout1.is_open())
{ {
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
fout1 << "LIBS += -lpcre\n"; fout1 << "LIBS += -L../externals -lpcre\n";
fout1 << "INCLUDEPATH += ../externals\n";
fout1 << "HEADERS += $$PWD/check.h \\\n"; fout1 << "HEADERS += $$PWD/check.h \\\n";
for (unsigned int i = 0; i < libfiles.size(); ++i) for (unsigned int i = 0; i < libfiles.size(); ++i)
{ {
@ -172,6 +173,8 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
// Makefile settings.. // Makefile settings..
if (release) if (release)
{ {
@ -179,8 +182,6 @@ int main(int argc, char **argv)
} }
else else
{ {
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
// TODO: add more compiler warnings. // TODO: add more compiler warnings.
// -Wconversion : generates too many compiler warnings currently // -Wconversion : generates too many compiler warnings currently
// -Wlogical-op : doesn't work on older GCC // -Wlogical-op : doesn't work on older GCC