summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.h
diff options
context:
space:
mode:
authorAlexander Boczar <alexboc@microsoft.com>2019-09-14 00:32:13 (GMT)
committerBrad King <brad.king@kitware.com>2019-10-15 17:28:41 (GMT)
commit99e83d423500e11a8e85c2032e8c536bce175ed1 (patch)
treead294f09e5fb3f9804e3f99d64f95d9bbc51761a /Source/cmGlobalVisualStudio10Generator.h
parent60509518124e715994900afa88530558b248510c (diff)
downloadCMake-99e83d423500e11a8e85c2032e8c536bce175ed1.zip
CMake-99e83d423500e11a8e85c2032e8c536bce175ed1.tar.gz
CMake-99e83d423500e11a8e85c2032e8c536bce175ed1.tar.bz2
cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET
Extend the `cmGlobalGenerator::SetGeneratorToolset` signature to indicate when it is called from `cmake::build`.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.h')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 9adcf08..e0968ab 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -20,7 +20,8 @@ public:
bool SetSystemName(std::string const& s, cmMakefile* mf) override;
bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf) override;
- bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf) override;
+ bool SetGeneratorToolset(std::string const& ts, bool build,
+ cmMakefile* mf) override;
std::vector<GeneratedMakeCommand> GenerateBuildCommand(
const std::string& makeProgram, const std::string& projectName,