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

Build: Renamed HAVE_DEPENDENCIES to HAVE_RULES

This commit is contained in:
Daniel Marjamäki 2011-02-14 19:37:58 +01:00
parent cdd8d3f785
commit 805773663e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# This file is generated by tools/dmake, do not edit. # This file is generated by tools/dmake, do not edit.
ifndef CXXFLAGS ifndef CXXFLAGS
CXXFLAGS=-DHAVE_DEPENDENCIES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
endif endif
ifndef CXX ifndef CXX

4
cli/cmdlineparser.cpp
View File

@ -28,7 +28,7 @@
#include "path.h" #include "path.h"
#include "filelister.h" #include "filelister.h"
#ifdef HAVE_DEPENDENCIES #ifdef HAVE_RULES
// xml is used in rules // xml is used in rules
#include <tinyxml.h> #include <tinyxml.h>
#endif #endif
@ -505,7 +505,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
_settings->_showtime = SHOWTIME_NONE; _settings->_showtime = SHOWTIME_NONE;
} }
#ifdef HAVE_DEPENDENCIES #ifdef HAVE_RULES
// Rule given at command line // Rule given at command line
else if (strncmp(argv[i], "--rule=", 7) == 0) else if (strncmp(argv[i], "--rule=", 7) == 0)
{ {

4
lib/cppcheck.cpp
View File

@ -30,7 +30,7 @@
#include <ctime> #include <ctime>
#include "timer.h" #include "timer.h"
#ifdef HAVE_DEPENDENCIES #ifdef HAVE_RULES
#define PCRE_STATIC #define PCRE_STATIC
#include <pcre.h> #include <pcre.h>
#endif #endif
@ -309,7 +309,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
(*it)->runSimplifiedChecks(&_tokenizer, &_settings, this); (*it)->runSimplifiedChecks(&_tokenizer, &_settings, this);
} }
#ifdef HAVE_DEPENDENCIES #ifdef HAVE_RULES
// Are there extra rules? // Are there extra rules?
if (!_settings.rules.empty()) if (!_settings.rules.empty())
{ {

4
tools/dmake.cpp
View File

@ -225,7 +225,7 @@ int main(int argc, char **argv)
// Makefile settings.. // Makefile settings..
if (release) if (release)
{ {
makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_DEPENDENCIES -Wall"); makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_RULES -Wall");
} }
else else
{ {
@ -235,7 +235,7 @@ int main(int argc, char **argv)
// The _GLIBCXX_DEBUG doesn't work in cygwin // The _GLIBCXX_DEBUG doesn't work in cygwin
makeConditionalVariable(fout, "CXXFLAGS", makeConditionalVariable(fout, "CXXFLAGS",
"-DHAVE_DEPENDENCIES " "-DHAVE_RULES "
"-Wall " "-Wall "
"-Wextra " "-Wextra "
"-Wshadow " "-Wshadow "