diff options
author | Brad King <brad.king@kitware.com> | 2012-12-10 15:52:10 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-02-07 16:06:28 (GMT) |
commit | 650c6471600fa8b06ed343ff3a4f3d16a3dc95bc (patch) | |
tree | acb198ff664687a5cfad1fa238d46a9c80e74570 /Source/cmGlobalVisualStudio10Generator.h | |
parent | 4fd534295642b1c08c72229d705db6c7265ecd28 (diff) | |
download | CMake-650c6471600fa8b06ed343ff3a4f3d16a3dc95bc.zip CMake-650c6471600fa8b06ed343ff3a4f3d16a3dc95bc.tar.gz CMake-650c6471600fa8b06ed343ff3a4f3d16a3dc95bc.tar.bz2 |
VS: Implement generator toolset selection (#10722, #13774)
Implement generator toolset selection (cmake -T) for VS >= 10 by setting
the PlatformToolset. Extend the RunCMake.GeneratorToolset test case to
verify CMAKE_GENERATOR_TOOLSET when the generator supports -T.
Since commit 485a940e (VS: Simplify MSVC version reporting, 2012-08-23)
all MSVC version information is detected during the compiler id step
from the actual compiler invoked by generated build systems rather than
hard-coded in VS generators. Therefore we can set the PlatformToolset
in VS >= 10 project files and support toolsets from other VS versions.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
-rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index b377a20..5926e0f 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -28,6 +28,8 @@ public: const char* architectureId, const char* additionalPlatformDefinition); static cmGlobalGeneratorFactory* NewFactory(); + virtual bool SetGeneratorToolset(std::string const& ts); + virtual std::string GenerateBuildCommand(const char* makeProgram, const char *projectName, |