diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-15 17:09:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-15 17:09:06 (GMT) |
| commit | d099546450a9c9ce12763cab1af182b2d98ebba6 (patch) | |
| tree | 42da6de42c96a31aa35236128c4bef7c8ff64a7e /Source/cmLocalGenerator.cxx | |
| parent | d5d661d2b259447edfc89d130878f3a9b2203ea1 (diff) | |
| download | CMake-d099546450a9c9ce12763cab1af182b2d98ebba6.zip CMake-d099546450a9c9ce12763cab1af182b2d98ebba6.tar.gz CMake-d099546450a9c9ce12763cab1af182b2d98ebba6.tar.bz2 | |
Factor old-style -D flags out from -I flag generation
Move the GetDefineFlags call from cmLocalGenerator::GetIncludeFlags to
all call sites so that the method exclusively constructs a string of
include search path flags.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index d3cbc1f..29853e5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -575,6 +575,7 @@ void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname, flags += this->Makefile->GetSafeDefinition(varString.c_str()); flags += " "; flags += this->GetIncludeFlags(lang); + flags += this->Makefile->GetDefineFlags(); // Construct the command lines. cmCustomCommandLines commandLines; @@ -1291,8 +1292,6 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) { flags[flags.size()-1] = ' '; } - std::string defineFlags = this->Makefile->GetDefineFlags(); - flags += defineFlags; this->LanguageToIncludeFlags[lang] = flags; // Use this temorary variable for the return value to work-around a |