Skip to content

Commit ee38e77

Browse files
committed
keep unexpanded properties in paths
1 parent 52b51e0 commit ee38e77

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

lib/importproject.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,10 +1623,9 @@ struct ImportProject::PropertyValueExpander {
16231623
if (name.empty() || !hasValue(name)) {
16241624
const std::size_t end = findMatchingParen(mStr, start + 2);
16251625
mPos = (end != std::string::npos) ? end + 1 : mStr.size();
1626-
if (!name.empty() && isSymbolicProperty(name))
1627-
return mStr.substr(start, mPos - start);
1628-
return std::string();
1626+
return mStr.substr(start, mPos - start);
16291627
}
1628+
16301629
std::string value = lookup(name);
16311630
// Parse optional .Method(args) chain.
16321631
while (mPos < mStr.size() && mStr[mPos] == '.') {
@@ -3555,11 +3554,6 @@ ImportProject::ImportResult ImportProject::importProject(const tinyxml2::XMLElem
35553554
const char *projectAttribute = node->Attribute("Project");
35563555
if (!projectAttribute)
35573556
return ImportResult::Ok;
3558-
if (std::strcmp(projectAttribute, "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props") == 0) {
3559-
printf("%s\n", projectAttribute);
3560-
}
3561-
3562-
35633557
// During the discovery pass, re-run as a Properties-phase import but silently
35643558
// discard any errors/debugs it generates -- approximate properties cause many
35653559
// spurious failures that would confuse the user.

0 commit comments

Comments
 (0)