Merge topic 'constify'

f054201d cmMakefile: Return containers by const reference.
d1ac6ffd cmMakefile: Fix minor indentation inconsistency.

Source/cmMakefile.cxx

@@ -1570,23 +1570,23 @@ void cmMakefile::InitializeFromParent()
   // Initialize definitions with the closure of the parent scope.
   this->Internal->VarStack.top() = parent->Internal->VarStack.top().Closure();
 
-  const std::vector<cmValueWithOrigin> parentIncludes =
+  const std::vector<cmValueWithOrigin>& parentIncludes =
                                         parent->GetIncludeDirectoriesEntries();
   this->IncludeDirectoriesEntries.insert(this->IncludeDirectoriesEntries.end(),
-                                       parentIncludes.begin(),
-                                       parentIncludes.end());
+                                         parentIncludes.begin(),
+                                         parentIncludes.end());
 
-  const std::vector<cmValueWithOrigin> parentOptions =
+  const std::vector<cmValueWithOrigin>& parentOptions =
                                         parent->GetCompileOptionsEntries();
   this->CompileOptionsEntries.insert(this->CompileOptionsEntries.end(),
                                      parentOptions.begin(),
                                      parentOptions.end());
 
-  const std::vector<cmValueWithOrigin> parentDefines =
+  const std::vector<cmValueWithOrigin>& parentDefines =
                                       parent->GetCompileDefinitionsEntries();
   this->CompileDefinitionsEntries.insert(this->CompileDefinitionsEntries.end(),
-                                     parentDefines.begin(),
-                                     parentDefines.end());
+                                         parentDefines.begin(),
+                                         parentDefines.end());
 
   this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
 

Source/cmMakefile.h

@@ -853,15 +853,15 @@ public:
   /** Set whether or not to report a CMP0000 violation.  */
   void SetCheckCMP0000(bool b) { this->CheckCMP0000 = b; }
 
-  std::vector<cmValueWithOrigin> GetIncludeDirectoriesEntries() const
+  const std::vector<cmValueWithOrigin>& GetIncludeDirectoriesEntries() const
   {
     return this->IncludeDirectoriesEntries;
   }
-  std::vector<cmValueWithOrigin> GetCompileOptionsEntries() const
+  const std::vector<cmValueWithOrigin>& GetCompileOptionsEntries() const
   {
     return this->CompileOptionsEntries;
   }
-  std::vector<cmValueWithOrigin> GetCompileDefinitionsEntries() const
+  const std::vector<cmValueWithOrigin>& GetCompileDefinitionsEntries() const
   {
     return this->CompileDefinitionsEntries;
   }