From d4f706e040be989caa32052ced470193ce449643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 25 Oct 2009 19:29:10 +0100 Subject: [PATCH] fixed qmake building with new folder structure --- Makefile | 22 +++++++++++----------- lib/src.pro => cli/cli.pro | 3 ++- cli/main.cpp | 2 +- gui/checkthread.h | 4 ++-- gui/gui.pro | 2 +- gui/mainwindow.cpp | 4 ++-- gui/resultsview.h | 2 +- gui/threadhandler.h | 4 ++-- gui/threadresult.h | 2 +- {cli => lib}/cppcheckexecutor.cpp | 0 {cli => lib}/cppcheckexecutor.h | 0 lib/{src.pri => lib.pri} | 2 ++ {cli => lib}/threadexecutor.cpp | 0 {cli => lib}/threadexecutor.h | 0 14 files changed, 25 insertions(+), 22 deletions(-) rename lib/src.pro => cli/cli.pro (95%) rename {cli => lib}/cppcheckexecutor.cpp (100%) rename {cli => lib}/cppcheckexecutor.h (100%) rename lib/{src.pri => lib.pri} (94%) rename {cli => lib}/threadexecutor.cpp (100%) rename {cli => lib}/threadexecutor.h (100%) diff --git a/Makefile b/Makefile index 9184cac97..43c6203dc 100644 --- a/Makefile +++ b/Makefile @@ -16,17 +16,17 @@ LIBOBJ = lib/checkautovariables.o \ lib/checkstl.o \ lib/checkunusedfunctions.o \ lib/cppcheck.o \ + lib/cppcheckexecutor.o \ lib/errorlogger.o \ lib/filelister.o \ lib/mathlib.o \ lib/preprocessor.o \ lib/settings.o \ + lib/threadexecutor.o \ lib/token.o \ lib/tokenize.o -CLIOBJ = cli/cppcheckexecutor.o \ - cli/main.o \ - cli/threadexecutor.o +CLIOBJ = cli/main.o TESTOBJ = test/testautovariables.o \ test/testbufferoverrun.o \ @@ -74,7 +74,7 @@ tools/dmake: tools/dmake.cpp lib/filelister.cpp lib/filelister.h $(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp lib/filelister.cpp $(LDFLAGS) clean: - rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg + rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake install: cppcheck install -d ${BIN} @@ -116,6 +116,9 @@ lib/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/checkunusedfunction lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/preprocessor.h lib/filelister.h lib/check.h $(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheck.o lib/cppcheck.cpp +lib/cppcheckexecutor.o: lib/cppcheckexecutor.cpp lib/cppcheckexecutor.h lib/errorlogger.h lib/settings.h lib/cppcheck.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/threadexecutor.h + $(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheckexecutor.o lib/cppcheckexecutor.cpp + lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/settings.h lib/tokenize.h lib/classinfo.h lib/token.h $(CXX) $(CXXFLAGS) -Ilib -c -o lib/errorlogger.o lib/errorlogger.cpp @@ -131,21 +134,18 @@ lib/preprocessor.o: lib/preprocessor.cpp lib/preprocessor.h lib/errorlogger.h li lib/settings.o: lib/settings.cpp lib/settings.h $(CXX) $(CXXFLAGS) -Ilib -c -o lib/settings.o lib/settings.cpp +lib/threadexecutor.o: lib/threadexecutor.cpp lib/threadexecutor.h lib/settings.h lib/errorlogger.h lib/cppcheck.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h + $(CXX) $(CXXFLAGS) -Ilib -c -o lib/threadexecutor.o lib/threadexecutor.cpp + lib/token.o: lib/token.cpp lib/token.h $(CXX) $(CXXFLAGS) -Ilib -c -o lib/token.o lib/token.cpp lib/tokenize.o: lib/tokenize.cpp lib/tokenize.h lib/classinfo.h lib/token.h lib/filelister.h lib/mathlib.h lib/settings.h lib/errorlogger.h lib/check.h $(CXX) $(CXXFLAGS) -Ilib -c -o lib/tokenize.o lib/tokenize.cpp -cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cppcheckexecutor.h cli/threadexecutor.h - $(CXX) $(CXXFLAGS) -Ilib -c -o cli/cppcheckexecutor.o cli/cppcheckexecutor.cpp - -cli/main.o: cli/main.cpp cli/cppcheckexecutor.h +cli/main.o: cli/main.cpp lib/cppcheckexecutor.h lib/errorlogger.h lib/settings.h $(CXX) $(CXXFLAGS) -Ilib -c -o cli/main.o cli/main.cpp -cli/threadexecutor.o: cli/threadexecutor.cpp cli/threadexecutor.h - $(CXX) $(CXXFLAGS) -Ilib -c -o cli/threadexecutor.o cli/threadexecutor.cpp - test/testautovariables.o: test/testautovariables.cpp test/testsuite.h $(CXX) $(CXXFLAGS) -Ilib -c -o test/testautovariables.o test/testautovariables.cpp diff --git a/lib/src.pro b/cli/cli.pro similarity index 95% rename from lib/src.pro rename to cli/cli.pro index f5106b767..0ce00d2a0 100644 --- a/lib/src.pro +++ b/cli/cli.pro @@ -6,7 +6,8 @@ OBJECTS_DIR = temp CONFIG += warn_on CONFIG -= qt app_bundle -include($$PWD/src.pri) +include($$PWD/../lib/lib.pri) + SOURCES += main.cpp win32 { diff --git a/cli/main.cpp b/cli/main.cpp index e68972935..5fb29cd5f 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -82,7 +82,7 @@ void CheckOther::checkZeroDivision() */ -#include "cppcheckexecutor.h" +#include "../lib/cppcheckexecutor.h" /** * Main function of cppcheck diff --git a/gui/checkthread.h b/gui/checkthread.h index f32f6cc50..8870f6786 100644 --- a/gui/checkthread.h +++ b/gui/checkthread.h @@ -21,8 +21,8 @@ #define CHECKTHREAD_H #include -#include "../src/cppcheck.h" -#include "../src/settings.h" +#include "../lib/cppcheck.h" +#include "../lib/settings.h" #include "threadresult.h" /// @addtogroup GUI diff --git a/gui/gui.pro b/gui/gui.pro index 8fb4f1a28..5e314077a 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -27,7 +27,7 @@ TRANSLATIONS = cppcheck_fi.ts \ # Windows-specific options CONFIG += embed_manifest_exe -include($$PWD/../src/src.pri) +include($$PWD/../lib/lib.pri) HEADERS += mainwindow.h \ checkthread.h \ resultsview.h \ diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 2bbb67f8d..238328592 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -32,8 +32,8 @@ #include "fileviewdialog.h" #include "projectfile.h" #include "report.h" -#include "../src/filelister.h" -#include "../src/cppcheckexecutor.h" +#include "../lib/filelister.h" +#include "../lib/cppcheckexecutor.h" MainWindow::MainWindow() : mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)), diff --git a/gui/resultsview.h b/gui/resultsview.h index b9e54f74b..7704184c0 100644 --- a/gui/resultsview.h +++ b/gui/resultsview.h @@ -23,7 +23,7 @@ #include #include -#include "../src/errorlogger.h" +#include "../lib/errorlogger.h" #include "resultstree.h" #include "common.h" #include "report.h" diff --git a/gui/threadhandler.h b/gui/threadhandler.h index b8ce9c6bf..e501d196c 100644 --- a/gui/threadhandler.h +++ b/gui/threadhandler.h @@ -22,8 +22,8 @@ #include #include -#include "../src/settings.h" -#include "../src/cppcheck.h" +#include "../lib/settings.h" +#include "../lib/cppcheck.h" #include "threadresult.h" #include "checkthread.h" #include "resultsview.h" diff --git a/gui/threadresult.h b/gui/threadresult.h index 724606bec..f5b65c3ca 100644 --- a/gui/threadresult.h +++ b/gui/threadresult.h @@ -24,7 +24,7 @@ #include #include #include -#include "../src/errorlogger.h" +#include "../lib/errorlogger.h" /// @addtogroup GUI /// @{ diff --git a/cli/cppcheckexecutor.cpp b/lib/cppcheckexecutor.cpp similarity index 100% rename from cli/cppcheckexecutor.cpp rename to lib/cppcheckexecutor.cpp diff --git a/cli/cppcheckexecutor.h b/lib/cppcheckexecutor.h similarity index 100% rename from cli/cppcheckexecutor.h rename to lib/cppcheckexecutor.h diff --git a/lib/src.pri b/lib/lib.pri similarity index 94% rename from lib/src.pri rename to lib/lib.pri index 79b1dc649..22e37ce5d 100644 --- a/lib/src.pri +++ b/lib/lib.pri @@ -5,6 +5,7 @@ HEADERS += $$PWD/check.h \ $$PWD/checkbufferoverrun.h \ $$PWD/checkclass.h \ $$PWD/checkdangerousfunctions.h \ + $$PWD/checkexceptionsafety.h \ $$PWD/checkheaders.h \ $$PWD/checkmemoryleak.h \ $$PWD/checkother.h \ @@ -28,6 +29,7 @@ SOURCES += $$PWD/checkautovariables.cpp \ $$PWD/checkbufferoverrun.cpp \ $$PWD/checkclass.cpp \ $$PWD/checkdangerousfunctions.cpp \ + $$PWD/checkexceptionsafety.cpp \ $$PWD/checkheaders.cpp \ $$PWD/checkmemoryleak.cpp \ $$PWD/checkother.cpp \ diff --git a/cli/threadexecutor.cpp b/lib/threadexecutor.cpp similarity index 100% rename from cli/threadexecutor.cpp rename to lib/threadexecutor.cpp diff --git a/cli/threadexecutor.h b/lib/threadexecutor.h similarity index 100% rename from cli/threadexecutor.h rename to lib/threadexecutor.h