diff --git a/cli/cli.pro b/cli/cli.pro index 011919ff9..8b1e1bb02 100644 --- a/cli/cli.pro +++ b/cli/cli.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = cppcheck DEPENDPATH += . -INCLUDEPATH += . ../lib ../externals +INCLUDEPATH += . ../lib OBJECTS_DIR = temp CONFIG += warn_on CONFIG -= qt app_bundle diff --git a/lib/lib.pri b/lib/lib.pri index c01665b4f..10505fa76 100644 --- a/lib/lib.pri +++ b/lib/lib.pri @@ -1,6 +1,7 @@ # no manual edits - this file is autogenerated by dmake LIBS += -L../externals -lpcre +INCLUDEPATH += ../externals HEADERS += $$PWD/check.h \ $$PWD/checkautovariables.h \ $$PWD/checkbufferoverrun.h \ diff --git a/tools/dmake.cpp b/tools/dmake.cpp index 4c8d8a346..9cb34e869 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -138,7 +138,8 @@ int main(int argc, char **argv) if (fout1.is_open()) { 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"; for (unsigned int i = 0; i < libfiles.size(); ++i) { @@ -172,6 +173,8 @@ int main(int argc, char **argv) return EXIT_FAILURE; } + fout << "# This file is generated by tools/dmake, do not edit.\n\n"; + // Makefile settings.. if (release) { @@ -179,8 +182,6 @@ int main(int argc, char **argv) } else { - fout << "# This file is generated by tools/dmake, do not edit.\n\n"; - // TODO: add more compiler warnings. // -Wconversion : generates too many compiler warnings currently // -Wlogical-op : doesn't work on older GCC