Don't use relative paths in lib.pri.

Using relative path in included file binds it to be usable only
included from one directory. Instead use variable for giving the
base path for files.
This commit is contained in:
Kimmo Varis 2010-12-18 17:03:46 +02:00
parent a60b933ac7
commit 062eabf246
3 changed files with 56 additions and 53 deletions

View File

@ -8,6 +8,7 @@ CONFIG -= qt app_bundle
BASEPATH = ../externals/tinyxml/ BASEPATH = ../externals/tinyxml/
include($$PWD/../externals/tinyxml/tinyxml.pri) include($$PWD/../externals/tinyxml/tinyxml.pri)
BASEPATH = ../lib/
include($$PWD/../lib/lib.pri) include($$PWD/../lib/lib.pri)
SOURCES += main.cpp \ SOURCES += main.cpp \

View File

@ -47,7 +47,9 @@ TRANSLATIONS = cppcheck_fi.ts \
# Windows-specific options # Windows-specific options
CONFIG += embed_manifest_exe CONFIG += embed_manifest_exe
BASEPATH = ../lib/
include($$PWD/../lib/lib.pri) include($$PWD/../lib/lib.pri)
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
checkthread.h \ checkthread.h \
resultsview.h \ resultsview.h \

View File

@ -2,57 +2,57 @@
LIBS += -L../externals -lpcre LIBS += -L../externals -lpcre
INCLUDEPATH += ../externals INCLUDEPATH += ../externals
HEADERS += ../lib/check.h \ HEADERS += $${BASEPATH}check.h \
../lib/checkautovariables.h \ $${BASEPATH}checkautovariables.h \
../lib/checkbufferoverrun.h \ $${BASEPATH}checkbufferoverrun.h \
../lib/checkclass.h \ $${BASEPATH}checkclass.h \
../lib/checkexceptionsafety.h \ $${BASEPATH}checkexceptionsafety.h \
../lib/checkmemoryleak.h \ $${BASEPATH}checkmemoryleak.h \
../lib/checknullpointer.h \ $${BASEPATH}checknullpointer.h \
../lib/checkobsoletefunctions.h \ $${BASEPATH}checkobsoletefunctions.h \
../lib/checkother.h \ $${BASEPATH}checkother.h \
../lib/checkpostfixoperator.h \ $${BASEPATH}checkpostfixoperator.h \
../lib/checkstl.h \ $${BASEPATH}checkstl.h \
../lib/checkuninitvar.h \ $${BASEPATH}checkuninitvar.h \
../lib/checkunusedfunctions.h \ $${BASEPATH}checkunusedfunctions.h \
../lib/cppcheck.h \ $${BASEPATH}cppcheck.h \
../lib/errorlogger.h \ $${BASEPATH}errorlogger.h \
../lib/executionpath.h \ $${BASEPATH}executionpath.h \
../lib/filelister.h \ $${BASEPATH}filelister.h \
../lib/filelister_unix.h \ $${BASEPATH}filelister_unix.h \
../lib/filelister_win32.h \ $${BASEPATH}filelister_win32.h \
../lib/mathlib.h \ $${BASEPATH}mathlib.h \
../lib/path.h \ $${BASEPATH}path.h \
../lib/preprocessor.h \ $${BASEPATH}preprocessor.h \
../lib/settings.h \ $${BASEPATH}settings.h \
../lib/symboldatabase.h \ $${BASEPATH}symboldatabase.h \
../lib/timer.h \ $${BASEPATH}timer.h \
../lib/token.h \ $${BASEPATH}token.h \
../lib/tokenize.h $${BASEPATH}tokenize.h
SOURCES += ../lib/checkautovariables.cpp \ SOURCES += $${BASEPATH}checkautovariables.cpp \
../lib/checkbufferoverrun.cpp \ $${BASEPATH}checkbufferoverrun.cpp \
../lib/checkclass.cpp \ $${BASEPATH}checkclass.cpp \
../lib/checkexceptionsafety.cpp \ $${BASEPATH}checkexceptionsafety.cpp \
../lib/checkmemoryleak.cpp \ $${BASEPATH}checkmemoryleak.cpp \
../lib/checknullpointer.cpp \ $${BASEPATH}checknullpointer.cpp \
../lib/checkobsoletefunctions.cpp \ $${BASEPATH}checkobsoletefunctions.cpp \
../lib/checkother.cpp \ $${BASEPATH}checkother.cpp \
../lib/checkpostfixoperator.cpp \ $${BASEPATH}checkpostfixoperator.cpp \
../lib/checkstl.cpp \ $${BASEPATH}checkstl.cpp \
../lib/checkuninitvar.cpp \ $${BASEPATH}checkuninitvar.cpp \
../lib/checkunusedfunctions.cpp \ $${BASEPATH}checkunusedfunctions.cpp \
../lib/cppcheck.cpp \ $${BASEPATH}cppcheck.cpp \
../lib/errorlogger.cpp \ $${BASEPATH}errorlogger.cpp \
../lib/executionpath.cpp \ $${BASEPATH}executionpath.cpp \
../lib/filelister.cpp \ $${BASEPATH}filelister.cpp \
../lib/filelister_unix.cpp \ $${BASEPATH}filelister_unix.cpp \
../lib/filelister_win32.cpp \ $${BASEPATH}filelister_win32.cpp \
../lib/mathlib.cpp \ $${BASEPATH}mathlib.cpp \
../lib/path.cpp \ $${BASEPATH}path.cpp \
../lib/preprocessor.cpp \ $${BASEPATH}preprocessor.cpp \
../lib/settings.cpp \ $${BASEPATH}settings.cpp \
../lib/symboldatabase.cpp \ $${BASEPATH}symboldatabase.cpp \
../lib/timer.cpp \ $${BASEPATH}timer.cpp \
../lib/token.cpp \ $${BASEPATH}token.cpp \
../lib/tokenize.cpp $${BASEPATH}tokenize.cpp