diff options
author | Brad King <brad.king@kitware.com> | 2008-01-18 00:29:43 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-18 00:29:43 (GMT) |
commit | 433099ecddb334cc6e43c6302594d7c713ef4d1e (patch) | |
tree | 65b1ec804f8e0e40c5b0c7083cbf6e0913572b55 /Source/cmLocalGenerator.cxx | |
parent | caca9b80652c7c36ed1e39e1faeec64e3397f632 (diff) | |
download | CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.zip CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.tar.gz CMake-433099ecddb334cc6e43c6302594d7c713ef4d1e.tar.bz2 |
ENH: Converted cmMakefile DefineFlags added by ADD_DEFINITIONS command into a COMPILE_DEFINITIONS directory property.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3ac703d..23179dc 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1179,7 +1179,6 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) flags[flags.size()-1] = ' '; } std::string defineFlags = this->Makefile->GetDefineFlags(); - this->FixDefineFlags(defineFlags, lang); flags += defineFlags; this->LanguageToIncludeFlags[lang] = flags; @@ -1190,40 +1189,6 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) } //---------------------------------------------------------------------------- -void cmLocalGenerator::FixDefineFlags(std::string& flags, - const char* lang) -{ - std::string defineFlagVar = "CMAKE_"; - defineFlagVar += lang; - defineFlagVar += "_DEFINE_FLAG"; - 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) { |