summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-03-15 17:09:06 (GMT)
committerBrad King <brad.king@kitware.com>2011-03-15 17:09:06 (GMT)
commitd099546450a9c9ce12763cab1af182b2d98ebba6 (patch)
tree42da6de42c96a31aa35236128c4bef7c8ff64a7e /Source/cmMakefileTargetGenerator.cxx
parentd5d661d2b259447edfc89d130878f3a9b2203ea1 (diff)
downloadCMake-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/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 9dcd8f1..a6f7777 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -312,6 +312,11 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
// Add include directory flags.
this->LocalGenerator->
AppendFlags(flags, this->LocalGenerator->GetIncludeFlags(lang));
+
+ // Append old-style preprocessor definition flags.
+ this->LocalGenerator->
+ AppendFlags(flags, this->Makefile->GetDefineFlags());
+
// Add include directory flags.
this->LocalGenerator->
AppendFlags(flags,this->GetFrameworkFlags().c_str());