diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-05 17:40:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-05 17:41:54 (GMT) |
| commit | 03b7b6cda1016dd16491f8051b45a5baa85f2282 (patch) | |
| tree | 04bdcaeb02675b98f06587f84cbb20050403306d /Source/cmGlobalXCodeGenerator.cxx | |
| parent | ff1fddb0bf40b8a7170d54ccdc9420c2d7190472 (diff) | |
| download | CMake-03b7b6cda1016dd16491f8051b45a5baa85f2282.zip CMake-03b7b6cda1016dd16491f8051b45a5baa85f2282.tar.gz CMake-03b7b6cda1016dd16491f8051b45a5baa85f2282.tar.bz2 | |
cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
Move handling of an empty toolset name into the implementation of the
method. This simplifies the VS 10 implementation of default toolset
selection because it has one code path that is always called.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 17f838c..13e6988 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -208,8 +208,11 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts, if(this->XcodeVersion >= 30) { this->GeneratorToolset = ts; - mf->AddDefinition("CMAKE_XCODE_PLATFORM_TOOLSET", - this->GeneratorToolset.c_str()); + if(!this->GeneratorToolset.empty()) + { + mf->AddDefinition("CMAKE_XCODE_PLATFORM_TOOLSET", + this->GeneratorToolset.c_str()); + } return true; } else |