diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-17 20:35:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-17 20:35:41 (GMT) |
| commit | e7fdb44b1be63e18d03e86f61611dba677e98978 (patch) | |
| tree | dd57f0a547724acb15b66a6bca4dda79c0de7687 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 6e176e6d9efa80fb4d08f1ead6bc33f115f8885d (diff) | |
| download | CMake-e7fdb44b1be63e18d03e86f61611dba677e98978.zip CMake-e7fdb44b1be63e18d03e86f61611dba677e98978.tar.gz CMake-e7fdb44b1be63e18d03e86f61611dba677e98978.tar.bz2 | |
VS: Delay detection of VS 10 Express 64-bit tools
Wait until SetSystemName when the CMAKE_SYSTEM_NAME is known.
Later the decision to use 64-bit tools may depend on it.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 03b2b2f..043f89d 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -128,6 +128,13 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts, bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, cmMakefile* mf) { + if(this->PlatformName == "Itanium" || this->PlatformName == "x64") + { + if(this->IsExpressEdition() && !this->Find64BitTools(mf)) + { + return false; + } + } this->AddVSPlatformToolsetDefinition(mf); return this->cmGlobalVisualStudio8Generator::SetSystemName(s, mf); } @@ -203,14 +210,6 @@ void cmGlobalVisualStudio10Generator ::EnableLanguage(std::vector<std::string>const & lang, cmMakefile *mf, bool optional) { - if(this->PlatformName == "Itanium" || this->PlatformName == "x64") - { - if(this->IsExpressEdition() && !this->Find64BitTools(mf)) - { - return; - } - } - for(std::vector<std::string>::const_iterator it = lang.begin(); it != lang.end(); ++it) { |