diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-10 09:13:54 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-10 09:38:35 -0500 |
| commit | b91f6f39f7be92bab1302c4587dd51423f20cf00 (patch) | |
| tree | 168ccdfb376d9b3b99b916f09b54d4ab1f7d0e97 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 89cc3d432bc576d00cb12880b37ec8b348599897 (diff) | |
| download | cmake-b91f6f39f7be92bab1302c4587dd51423f20cf00.tar.gz | |
VS: Track explicitly when platform is specified in generator name
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 7573153f9d..a6bec4bd7e 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -407,7 +407,7 @@ bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) return false; } } else if (this->SystemName == "Android") { - if (this->DefaultPlatformName != "Win32") { + if (this->PlatformInGeneratorName) { std::ostringstream e; e << "CMAKE_SYSTEM_NAME is 'Android' but CMAKE_GENERATOR " << "specifies a platform too: '" << this->GetName() << "'"; @@ -438,7 +438,7 @@ bool cmGlobalVisualStudio10Generator::InitializeWindows(cmMakefile*) bool cmGlobalVisualStudio10Generator::InitializeWindowsCE(cmMakefile* mf) { - if (this->DefaultPlatformName != "Win32") { + if (this->PlatformInGeneratorName) { std::ostringstream e; e << "CMAKE_SYSTEM_NAME is 'WindowsCE' but CMAKE_GENERATOR " << "specifies a platform too: '" << this->GetName() << "'"; |