diff options
| author | Brad King <brad.king@kitware.com> | 2012-12-10 15:42:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-07 15:53:19 (GMT) |
| commit | 4fd534295642b1c08c72229d705db6c7265ecd28 (patch) | |
| tree | 6cd0fd251856c6a0ee50bccdaff9c5ad771c43a3 /Source/cmMakefile.cxx | |
| parent | 118c32f8f211b0bb9a096fbb0711cacf2b68f057 (diff) | |
| download | CMake-4fd534295642b1c08c72229d705db6c7265ecd28.zip CMake-4fd534295642b1c08c72229d705db6c7265ecd28.tar.gz CMake-4fd534295642b1c08c72229d705db6c7265ecd28.tar.bz2 | |
CMake: Add -T option to choose a generator toolset
Reject the option by default. It will be implemented on a per-generator
basis. Pass the setting into try_compile project generation. Add cache
entry CMAKE_GENERATOR_TOOLSET and associated variable documentation to
hold the value persistently.
Add a RunCMake.GeneratorToolset test to cover basic "-T" option cases.
Verify that CMAKE_GENERATOR_TOOLSET is empty without -T, that -T is
rejected when the generator doesn't support it, and that two -T options
are always rejected.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b432986..b45a61c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2973,6 +2973,7 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir, cm.SetStartDirectory(srcdir); cm.SetStartOutputDirectory(bindir); cm.SetCMakeCommand(cmakeCommand.c_str()); + cm.SetGeneratorToolset(this->GetCMakeInstance()->GetGeneratorToolset()); cm.LoadCache(); if(!gg->IsMultiConfig()) { |