diff options
author | Basil Fierz <basil.fierz@hotmail.com> | 2018-05-19 11:23:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-05-29 14:12:59 (GMT) |
commit | 5f1316841944198037d6463d3ddd12efcfae45b3 (patch) | |
tree | 3a58c25a578caa6813fa66efcc18eac968991368 /Source/cmGlobalVisualStudio10Generator.h | |
parent | a543a233a280f23e72ce5ff7d7a00239bd8634fb (diff) | |
download | CMake-5f1316841944198037d6463d3ddd12efcfae45b3.zip CMake-5f1316841944198037d6463d3ddd12efcfae45b3.tar.gz CMake-5f1316841944198037d6463d3ddd12efcfae45b3.tar.bz2 |
VS: Add option to select the version of the toolset used by VS 2017
Add new `version=` parameter in the toolset setting to select the
version. Add variable `CMAKE_VS_PLATFORM_TOOLSET_VERSION` to hold the
version, if one is set (blank indicates default).
Fixes: #17549
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index f2501c2..dcdab09 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -54,6 +54,10 @@ public: const char* GetPlatformToolset() const; std::string const& GetPlatformToolsetString() const; + /** The toolset version. */ + const char* GetPlatformToolsetVersion() const; + std::string const& GetPlatformToolsetVersionString() const; + /** The toolset host architecture name (e.g. x64 for 64-bit host tools). */ const char* GetPlatformToolsetHostArchitecture() const; @@ -101,6 +105,8 @@ public: std::string Encoding() override; virtual const char* GetToolsVersion() { return "4.0"; } + virtual std::string GetAuxiliaryToolset() const; + bool FindMakeProgram(cmMakefile* mf) override; static std::string GetInstalledNsightTegraVersion(); @@ -135,6 +141,7 @@ protected: std::string const& GetMSBuildCommand(); std::string GeneratorToolset; + std::string GeneratorToolsetVersion; std::string GeneratorToolsetHostArchitecture; std::string GeneratorToolsetCuda; std::string DefaultPlatformToolset; |