diff options
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 40 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 |
2 files changed, 40 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index f91ed10..e7d78cd 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1182,7 +1182,10 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) { flags[flags.size()-1] = ' '; } - flags += this->Makefile->GetDefineFlags(); + std::string defineFlags = this->Makefile->GetDefineFlags(); + std::cout << defineFlags << "\n"; + this->FixDefineFlags(defineFlags, lang); + flags += defineFlags; this->LanguageToIncludeFlags[lang] = flags; // Use this temorary variable for the return value to work-around a @@ -1192,6 +1195,41 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) } //---------------------------------------------------------------------------- +void cmLocalGenerator::FixDefineFlags(std::string& flags, + const char* lang) +{ + std::string defineFlagVar = "CMAKE_DEFINE_FLAG_"; + defineFlagVar += lang; + std::string defineFlag = + this->Makefile->GetSafeDefinition(defineFlagVar.c_str()); + if(defineFlag.size() == 0) + { + return; + } + std::vector<std::string> args; + cmSystemTools::ParseWindowsCommandLine(flags.c_str(), args); + std::string fixedFlags; + const char* sep = 0; + for(std::vector<std::string>::iterator i = args.begin(); + i != args.end(); ++i) + { + if(sep) + { + fixedFlags += sep; + } + else + { + sep = " "; + } + cmSystemTools::ReplaceString(*i, "-D", defineFlag.c_str()); + fixedFlags += *i; + } + flags = fixedFlags; +} + + + +//---------------------------------------------------------------------------- void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, bool filter_system_dirs) { diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index ac520b0..587a6f2 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -270,7 +270,7 @@ public: unsigned int minor, unsigned int patch = 0xFFu); protected: - + void FixDefineFlags(std::string& defineFlags, const char* lang); /** Construct a comment for a custom command. */ std::string ConstructComment(const cmCustomCommand& cc, const char* default_comment = ""); |