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

ImportProject: Only expose Cppcheck Visual Studio defines for Cppcheck

This commit is contained in:
Daniel Marjamäki 2017-08-08 22:26:42 +02:00
parent f42e7da295
commit 9861240e79
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cppcheck.cpp
View File

@ -93,7 +93,7 @@ unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
{ {
CppCheck temp(_errorLogger, _useGlobalSuppressions); CppCheck temp(_errorLogger, _useGlobalSuppressions);
temp._settings = _settings; temp._settings = _settings;
temp._settings.userDefines = fs.defines; temp._settings.userDefines = fs.cppcheckDefines();
temp._settings.includePaths = fs.includePaths; temp._settings.includePaths = fs.includePaths;
// TODO: temp._settings.userUndefs = fs.undefs; // TODO: temp._settings.userUndefs = fs.undefs;
if (fs.platformType != Settings::Unspecified) { if (fs.platformType != Settings::Unspecified) {

5
lib/importproject.cpp
View File

@ -495,15 +495,14 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str
FileSettings fs; FileSettings fs;
fs.filename = Path::simplifyPath(Path::isAbsolute(*c) ? *c : Path::getPathFromFilename(filename) + *c); fs.filename = Path::simplifyPath(Path::isAbsolute(*c) ? *c : Path::getPathFromFilename(filename) + *c);
fs.cfg = p->name; fs.cfg = p->name;
fs.defines = "_MSC_VER=1900;_WIN32=1"; fs.defines = "_WIN32=1";
if (p->platform == ProjectConfiguration::Win32) if (p->platform == ProjectConfiguration::Win32)
fs.platformType = cppcheck::Platform::Win32W; fs.platformType = cppcheck::Platform::Win32W;
else if (p->platform == ProjectConfiguration::x64) { else if (p->platform == ProjectConfiguration::x64) {
fs.platformType = cppcheck::Platform::Win64; fs.platformType = cppcheck::Platform::Win64;
fs.defines += ";_WIN64=1"; fs.defines += ";_WIN64=1";
} }
if (useOfMfc) fs.useMfc = useOfMfc;
fs.defines += ";__AFXWIN_H__";
std::string additionalIncludePaths; std::string additionalIncludePaths;
for (std::list<ItemDefinitionGroup>::const_iterator i = itemDefinitionGroupList.begin(); i != itemDefinitionGroupList.end(); ++i) { for (std::list<ItemDefinitionGroup>::const_iterator i = itemDefinitionGroupList.begin(); i != itemDefinitionGroupList.end(); ++i) {
if (!i->conditionIsTrue(*p)) if (!i->conditionIsTrue(*p))

6
lib/importproject.h
View File

@ -40,15 +40,19 @@ class CPPCHECKLIB ImportProject {
public: public:
/** File settings. Multiple configurations for a file is allowed. */ /** File settings. Multiple configurations for a file is allowed. */
struct FileSettings { struct FileSettings {
FileSettings() : platformType(cppcheck::Platform::Unspecified) {} FileSettings() : platformType(cppcheck::Platform::Unspecified), useMfc(false) {}
std::string cfg; std::string cfg;
std::string filename; std::string filename;
std::string defines; std::string defines;
std::string cppcheckDefines() const {
return useMfc ? (defines + ";_MSC_VER=1900;__AFXWIN_H__=1") : defines;
}
std::set<std::string> undefs; std::set<std::string> undefs;
std::list<std::string> includePaths; std::list<std::string> includePaths;
std::list<std::string> systemIncludePaths; std::list<std::string> systemIncludePaths;
std::string standard; std::string standard;
cppcheck::Platform::PlatformType platformType; cppcheck::Platform::PlatformType platformType;
bool useMfc;
void setDefines(std::string defs); void setDefines(std::string defs);
void setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string> &variables); void setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string> &variables);