diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-06 22:44:53 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-02-07 12:35:16 (GMT) |
| commit | 00ba28ffd03a9a0cf00d78001573bc5cc045ee72 (patch) | |
| tree | bb8c241b1938470badd41ecf2499a48317b11e1d /Source/cmExtraEclipseCDT4Generator.cxx | |
| parent | 0741eda2468e482baf1b5ff6a3a8d376143171e4 (diff) | |
| download | CMake-00ba28ffd03a9a0cf00d78001573bc5cc045ee72.zip CMake-00ba28ffd03a9a0cf00d78001573bc5cc045ee72.tar.gz CMake-00ba28ffd03a9a0cf00d78001573bc5cc045ee72.tar.bz2 | |
cmMakefile::GetRequiredDefinition: return const std::string&
Diffstat (limited to 'Source/cmExtraEclipseCDT4Generator.cxx')
| -rw-r--r-- | Source/cmExtraEclipseCDT4Generator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 30067b7..a6ce8b7 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -878,8 +878,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const xml.Attribute("moduleId", "org.eclipse.cdt.make.core.buildtargets"); xml.StartElement("buildTargets"); emmited.clear(); - const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); - const std::string makeArgs = + const std::string& make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); + const std::string& makeArgs = mf->GetSafeDefinition("CMAKE_ECLIPSE_MAKE_ARGUMENTS"); cmGlobalGenerator* generator = @@ -1074,7 +1074,8 @@ void cmExtraEclipseCDT4Generator::AppendStorageScanners( cmXMLWriter& xml, const cmMakefile& makefile) { // we need the "make" and the C (or C++) compiler which are used, Alex - std::string make = makefile.GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); + const std::string& make = + makefile.GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); std::string compiler = makefile.GetSafeDefinition("CMAKE_C_COMPILER"); std::string arg1 = makefile.GetSafeDefinition("CMAKE_C_COMPILER_ARG1"); if (compiler.empty()) { |