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

fixed qmake building with new folder structure

This commit is contained in:
Daniel Marjamäki 2009-10-25 19:29:10 +01:00
parent 0581c4195f
commit d4f706e040
14 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -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

3
lib/src.pro → cli/cli.pro
View File

@ -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 {

2
cli/main.cpp
View File

@ -82,7 +82,7 @@ void CheckOther::checkZeroDivision()
*/
#include "cppcheckexecutor.h"
#include "../lib/cppcheckexecutor.h"
/**
* Main function of cppcheck

4
gui/checkthread.h
View File

@ -21,8 +21,8 @@
#define CHECKTHREAD_H
#include <QThread>
#include "../src/cppcheck.h"
#include "../src/settings.h"
#include "../lib/cppcheck.h"
#include "../lib/settings.h"
#include "threadresult.h"
/// @addtogroup GUI

2
gui/gui.pro
View File

@ -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 \

4
gui/mainwindow.cpp
View File

@ -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)),

2
gui/resultsview.h
View File

@ -23,7 +23,7 @@
#include <QWidget>
#include <QProgressBar>
#include "../src/errorlogger.h"
#include "../lib/errorlogger.h"
#include "resultstree.h"
#include "common.h"
#include "report.h"

4
gui/threadhandler.h
View File

@ -22,8 +22,8 @@
#include <QObject>
#include <QStringList>
#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"

2
gui/threadresult.h
View File

@ -24,7 +24,7 @@
#include <QObject>
#include <QStringList>
#include <QVariant>
#include "../src/errorlogger.h"
#include "../lib/errorlogger.h"
/// @addtogroup GUI
/// @{

0
cli/cppcheckexecutor.cpp → lib/cppcheckexecutor.cpp
View File

0
cli/cppcheckexecutor.h → lib/cppcheckexecutor.h
View File

2
lib/src.pri → lib/lib.pri
View File

@ -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 \

0
cli/threadexecutor.cpp → lib/threadexecutor.cpp
View File

0
cli/threadexecutor.h → lib/threadexecutor.h
View File