summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio12Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-28 15:44:51 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-28 16:22:50 (GMT)
commit17cef3806d958bd03ec08b925fe585a0cfa204fa (patch)
tree897247990290b9e33d9b276a508c27d82452db8c /Source/cmGlobalVisualStudio12Generator.cxx
parentbf774e521b0a08dd8e09a93f76471cad593db3c6 (diff)
downloadCMake-17cef3806d958bd03ec08b925fe585a0cfa204fa.zip
CMake-17cef3806d958bd03ec08b925fe585a0cfa204fa.tar.gz
CMake-17cef3806d958bd03ec08b925fe585a0cfa204fa.tar.bz2
VS: Add support for explicit 32-bit toolset selection via host=x86
Generalize the ``host=x64`` option in `CMAKE_GENERATOR_TOOLSET` to also support ``host=x86``.
Diffstat (limited to 'Source/cmGlobalVisualStudio12Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio12Generator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 8b50684..d9702c9 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -126,8 +126,8 @@ bool cmGlobalVisualStudio12Generator::MatchesGeneratorName(
bool cmGlobalVisualStudio12Generator::ProcessGeneratorToolsetField(
std::string const& key, std::string const& value)
{
- if (key == "host" && value == "x64") {
- this->GeneratorToolsetHostArchitecture = "x64";
+ if (key == "host" && (value == "x64" || value == "x86")) {
+ this->GeneratorToolsetHostArchitecture = value;
return true;
}
return this->cmGlobalVisualStudio11Generator::ProcessGeneratorToolsetField(