summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-10-22 14:21:35 (GMT)
committerBrad King <brad.king@kitware.com>2009-10-22 14:21:35 (GMT)
commit0f0b726f500a4b4b39d5abe79fa490eb5f0939dc (patch)
treecc9b0bc6804c076f878e72fac0994d3da6c6e32b /Source/cmVisualStudio10TargetGenerator.cxx
parent57214662ae56950bd40ab641a5c19de15ced86ab (diff)
downloadCMake-0f0b726f500a4b4b39d5abe79fa490eb5f0939dc.zip
CMake-0f0b726f500a4b4b39d5abe79fa490eb5f0939dc.tar.gz
CMake-0f0b726f500a4b4b39d5abe79fa490eb5f0939dc.tar.bz2
Fix Microsoft.Cpp.$(Platform).user.props in VS10b2
MS changed the location of the Microsoft.Cpp.$(Platform).user.props file. This commit teaches the VS 10 generator about the new location. See issue #9759.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e1c1fba..860fe21 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -103,6 +103,7 @@ void cmVisualStudio10TargetGenerator::WriteString(const char* line,
(*this->BuildFileStream ) << line;
}
+#define VS10_USER_PROPS "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props"
void cmVisualStudio10TargetGenerator::Generate()
{
@@ -153,12 +154,9 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteString("<ImportGroup Label=\"ExtensionSettings\">\n", 1);
this->WriteString("</ImportGroup>\n", 1);
this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
- this->WriteString("<Import Project="
- "\"$(LocalAppData)\\Microsoft\\VisualStudio\\10.0\\"
- "Microsoft.Cpp.$(Platform).user.props\" "
- "Condition=\"exists('$(LocalAppData)\\Microsoft"
- "\\VisualStudio\\10.0\\"
- "Microsoft.Cpp.$(Platform).user.props')\" />\n", 2);
+ this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
+ " Condition=\"exists('" VS10_USER_PROPS "')\""
+ " Label=\"LocalAppDataPlatform\" />", 2);
this->WriteString("</ImportGroup>\n", 1);
this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
this->WritePathAndIncrementalLinkOptions();