summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-24 09:31:14 (GMT)
committerBrad King <brad.king@kitware.com>2015-05-27 13:18:31 (GMT)
commitc7b79aa16adc1117e62bf146c64f97c992ec2e2e (patch)
tree66fae23d85d71ff99d8ac1d131696707fcec34b1 /Source/cmGlobalGenerator.cxx
parent01e1cd5c1fc5e2684ec69d4916dd31ed23746055 (diff)
downloadCMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.zip
CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.gz
CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.bz2
cmGlobalGenerator: Require a cmake instance in ctor.
It is required anyway, so this makes it explicit.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 75d6186..64cd1de 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -48,7 +48,8 @@
#include <assert.h>
-cmGlobalGenerator::cmGlobalGenerator()
+cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
+ : CMakeInstance(cm)
{
// By default the .SYMBOLIC dependency is not needed on symbolic rules.
this->NeedSymbolicMark = false;
@@ -2141,12 +2142,6 @@ inline std::string removeQuotes(const std::string& s)
return s;
}
-void cmGlobalGenerator::SetCMakeInstance(cmake* cm)
-{
- // Store a pointer to the cmake object instance.
- this->CMakeInstance = cm;
-}
-
void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
{
cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();