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

--project: loading props when relative paths are given

This commit is contained in:
Daniel Marjamäki 2016-11-24 08:11:51 +01:00
parent a61f4e9c94
commit 8be50fd822
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/importproject.cpp
View File

@ -235,7 +235,11 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
if (std::strcmp(node->Name(), "ImportGroup") == 0 && node->Attribute("Label") && std::strcmp(node->Attribute("Label"),"PropertySheets")==0) { if (std::strcmp(node->Name(), "ImportGroup") == 0 && node->Attribute("Label") && std::strcmp(node->Attribute("Label"),"PropertySheets")==0) {
for (const tinyxml2::XMLElement *importGroup = node->FirstChildElement(); importGroup; importGroup = importGroup->NextSiblingElement()) { for (const tinyxml2::XMLElement *importGroup = node->FirstChildElement(); importGroup; importGroup = importGroup->NextSiblingElement()) {
if (std::strcmp(importGroup->Name(), "Import") == 0 && importGroup->Attribute("Project")) { if (std::strcmp(importGroup->Name(), "Import") == 0 && importGroup->Attribute("Project")) {
loadVisualStudioProperties(importGroup->Attribute("Project"), variables, includePath, additionalIncludeDirectories); std::string loadprj = importGroup->Attribute("Project");
if (loadprj.find("$") == std::string::npos) {
loadprj = Path::getPathFromFilename(filename) + loadprj;
}
loadVisualStudioProperties(loadprj, variables, includePath, additionalIncludeDirectories);
} }
} }
} else if (std::strcmp(node->Name(),"PropertyGroup")==0) { } else if (std::strcmp(node->Name(),"PropertyGroup")==0) {