-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reverted non-CMake changes in previous 'Added CMake files' commit
- Loading branch information
Daniel Marjamäki
committed
Mar 25, 2011
1 parent
9301ee2
commit 5058cc6
Showing
8 changed files
with
93 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,81 @@ | ||
|
|
||
| TEMPLATE = app | ||
| TARGET = test | ||
| DEPENDPATH += . | ||
| TINYXML_DIR = ../externals/tinyxml/ | ||
| INCLUDEPATH += . ../cli ../lib $${TINYXML_DIR} | ||
| OBJECTS_DIR = temp | ||
| CONFIG += warn_on console | ||
| CONFIG -= qt app_bundle | ||
| win32 { | ||
| LIBS += -lshlwapi | ||
| } | ||
|
|
||
| BASEPATH = $${TINYXML_DIR} | ||
| include($${TINYXML_DIR}tinyxml.pri) | ||
| BASEPATH = ../lib/ | ||
| include(../lib/lib.pri) | ||
|
|
||
| # cli/* | ||
| SOURCES += ../cli/cmdlineparser.cpp \ | ||
| ../cli/cppcheckexecutor.cpp \ | ||
| ../cli/filelister.cpp \ | ||
| ../cli/filelister_unix.cpp \ | ||
| ../cli/filelister_win32.cpp \ | ||
| ../cli/threadexecutor.cpp | ||
| HEADERS += ../cli/cmdlineparser.h \ | ||
| ../cli/cppcheckexecutor.h \ | ||
| ../cli/filelister.h \ | ||
| ../cli/filelister_unix.h \ | ||
| ../cli/filelister_win32.h \ | ||
| ../cli/threadexecutor.h | ||
|
|
||
| # test/* | ||
| HEADERS += options.h redirect.h testsuite.h | ||
| SOURCES += options.cpp \ | ||
| testautovariables.cpp \ | ||
| testbufferoverrun.cpp \ | ||
| testcharvar.cpp \ | ||
| testclass.cpp \ | ||
| testcmdlineparser.cpp \ | ||
| testconstructors.cpp \ | ||
| testcppcheck.cpp \ | ||
| testdivision.cpp \ | ||
| testerrorlogger.cpp \ | ||
| testexceptionsafety.cpp \ | ||
| testincompletestatement.cpp \ | ||
| testmathlib.cpp \ | ||
| testmemleak.cpp \ | ||
| testnullpointer.cpp \ | ||
| testobsoletefunctions.cpp \ | ||
| testoptions.cpp \ | ||
| testother.cpp \ | ||
| testpath.cpp \ | ||
| testpostfixoperator.cpp \ | ||
| testpreprocessor.cpp \ | ||
| testrunner.cpp \ | ||
| testsettings.cpp \ | ||
| testsimplifytokens.cpp \ | ||
| teststl.cpp \ | ||
| testsuite.cpp \ | ||
| testthreadexecutor.cpp \ | ||
| testtoken.cpp \ | ||
| testtokenize.cpp \ | ||
| testuninitvar.cpp \ | ||
| testunusedfunctions.cpp \ | ||
| testunusedprivfunc.cpp \ | ||
| testunusedvar.cpp | ||
|
|
||
| # Change Visual Studio compiler (CL) warning level to W4 | ||
| contains(QMAKE_CXX, cl) { | ||
| QMAKE_CXXFLAGS_WARN_ON -= -W3 | ||
| QMAKE_CXXFLAGS_WARN_ON += -W4 | ||
| DEFINES += _CRT_SECURE_NO_WARNINGS | ||
|
|
||
| TEMPLATE = app | ||
| TARGET = test | ||
| DEPENDPATH += . | ||
| INCLUDEPATH += . ../cli ../lib | ||
| OBJECTS_DIR = temp | ||
| CONFIG += warn_on console | ||
| CONFIG -= qt app_bundle | ||
| win32 { | ||
| LIBS += -lshlwapi | ||
| } | ||
|
|
||
| BASEPATH = ../externals/tinyxml/ | ||
| include(../externals/tinyxml/tinyxml.pri) | ||
| BASEPATH = ../lib/ | ||
| include(../lib/lib.pri) | ||
|
|
||
| # cli/* | ||
| SOURCES += ../cli/cmdlineparser.cpp \ | ||
| ../cli/cppcheckexecutor.cpp \ | ||
| ../cli/filelister.cpp \ | ||
| ../cli/pathmatch.cpp \ | ||
| ../cli/threadexecutor.cpp \ | ||
| testpathmatch.cpp | ||
| HEADERS += ../cli/cmdlineparser.h \ | ||
| ../cli/cppcheckexecutor.h \ | ||
| ../cli/filelister.h \ | ||
| ../cli/pathmatch.h \ | ||
| ../cli/threadexecutor.h | ||
|
|
||
| # test/* | ||
|
|
||
| # Note: | ||
| # testfilelister_unix.cpp omitted since there is test fail when run in QtCreator | ||
| # Test assumes the test (executable) is built from the test directory (or | ||
| # directory containing source files). But QtCreator builds to separate build | ||
| # directory. Hence the test does not find the source files. | ||
|
|
||
| HEADERS += options.h redirect.h testsuite.h | ||
| SOURCES += options.cpp \ | ||
| testautovariables.cpp \ | ||
| testbufferoverrun.cpp \ | ||
| testcharvar.cpp \ | ||
| testclass.cpp \ | ||
| testcmdlineparser.cpp \ | ||
| testconstructors.cpp \ | ||
| testcppcheck.cpp \ | ||
| testdivision.cpp \ | ||
| testerrorlogger.cpp \ | ||
| testexceptionsafety.cpp \ | ||
| testincompletestatement.cpp \ | ||
| testmathlib.cpp \ | ||
| testmemleak.cpp \ | ||
| testnullpointer.cpp \ | ||
| testobsoletefunctions.cpp \ | ||
| testoptions.cpp \ | ||
| testother.cpp \ | ||
| testpath.cpp \ | ||
| testpathmatch.cpp \ | ||
| testpostfixoperator.cpp \ | ||
| testpreprocessor.cpp \ | ||
| testrunner.cpp \ | ||
| testsettings.cpp \ | ||
| testsimplifytokens.cpp \ | ||
| teststl.cpp \ | ||
| testsuite.cpp \ | ||
| testsymboldatabase.cpp \ | ||
| testthreadexecutor.cpp \ | ||
| testtoken.cpp \ | ||
| testtokenize.cpp \ | ||
| testuninitvar.cpp \ | ||
| testunusedfunctions.cpp \ | ||
| testunusedprivfunc.cpp \ | ||
| testunusedvar.cpp | ||
|
|
||
| # Change Visual Studio compiler (CL) warning level to W4 | ||
| contains(QMAKE_CXX, cl) { | ||
| QMAKE_CXXFLAGS_WARN_ON -= -W3 | ||
| QMAKE_CXXFLAGS_WARN_ON += -W4 | ||
| DEFINES += _CRT_SECURE_NO_WARNINGS | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters