summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-14 13:25:34 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-14 13:25:34 (GMT)
commita8513d8a80dbf654915a3176673e7f7ef544a957 (patch)
tree55a6a1c0c997602765f5765ee327008b27df75dd /Source/cmVisualStudio10TargetGenerator.cxx
parenteb923da2c41ab811a6adec44ef87f3aa8bd26849 (diff)
parentd079e71c290c3c55a2db5180953daf014a964c25 (diff)
downloadCMake-a8513d8a80dbf654915a3176673e7f7ef544a957.zip
CMake-a8513d8a80dbf654915a3176673e7f7ef544a957.tar.gz
CMake-a8513d8a80dbf654915a3176673e7f7ef544a957.tar.bz2
Merge topic 'vs-host-x64-tools'
d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 82f4b99..8524ecc 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -329,6 +329,15 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteString("</PropertyGroup>\n", 1);
}
+ if (const char* hostArch =
+ this->GlobalGenerator->GetPlatformToolsetHostArchitecture()) {
+ this->WriteString("<PropertyGroup>\n", 1);
+ this->WriteString("<PreferredToolArchitecture>", 2);
+ (*this->BuildFileStream) << cmVS10EscapeXML(hostArch)
+ << "</PreferredToolArchitecture>\n";
+ this->WriteString("</PropertyGroup>\n", 1);
+ }
+
this->WriteProjectConfigurations();
this->WriteString("<PropertyGroup Label=\"Globals\">\n", 1);
this->WriteString("<ProjectGUID>", 2);