Browse Source

cmMakefile: Return a string from GetDefineFlags

Flip condition in GHS for readability.
pull/275/head
Stephen Kelly 9 years ago
committed by Brad King
parent
commit
c637e0c53b
  1. 2
      Source/cmGhsMultiTargetGenerator.cxx
  2. 2
      Source/cmMakefile.h

2
Source/cmGhsMultiTargetGenerator.cxx

@ -244,7 +244,7 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config,
flags, this->GeneratorTarget, lang);
// Append old-style preprocessor definition flags.
if (std::string(" ") != std::string(this->Makefile->GetDefineFlags())) {
if (this->Makefile->GetDefineFlags() != " ") {
this->LocalGenerator->AppendFlags(flags,
this->Makefile->GetDefineFlags());
}

2
Source/cmMakefile.h

@ -447,7 +447,7 @@ public:
/**
* Get a list of preprocessor define flags.
*/
const char* GetDefineFlags() const { return this->DefineFlags.c_str(); }
std::string GetDefineFlags() const { return this->DefineFlags; }
/**
* Make sure CMake can write this file

Loading…
Cancel
Save