summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-01-18 00:29:43 (GMT)
committerBrad King <brad.king@kitware.com>2008-01-18 00:29:43 (GMT)
commit433099ecddb334cc6e43c6302594d7c713ef4d1e (patch)
tree65b1ec804f8e0e40c5b0c7083cbf6e0913572b55 /Source/cmLocalVisualStudio7Generator.cxx
parentcaca9b80652c7c36ed1e39e1faeec64e3397f632 (diff)
downloadCMake-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/cmLocalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 2480622..f9ebb85 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -532,7 +532,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
targetOptions.FixExceptionHandlingDefault();
targetOptions.Parse(flags.c_str());
targetOptions.Parse(defineFlags.c_str());
+ targetOptions.AddDefines
+ (this->Makefile->GetProperty("COMPILE_DEFINITIONS"));
targetOptions.AddDefines(target.GetProperty("COMPILE_DEFINITIONS"));
+ targetOptions.AddDefines(this->Makefile->GetProperty(defPropName.c_str()));
targetOptions.AddDefines(target.GetProperty(defPropName.c_str()));
targetOptions.SetVerboseMakefile(
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));