From 68cf9e0a0df1cf40ee5da0f25057a82b31d97ec3 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 4 Dec 2008 08:57:27 -0500 Subject: BUG: fix for bug #8216 --- Source/cmLocalVisualStudio6Generator.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index 846a6ca..ec09fd1 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -1528,13 +1528,12 @@ void cmLocalVisualStudio6Generator this->AppendDefines(releaseDefines,target.GetProperty("COMPILE_DEFINITIONS_RELEASE"), 0); this->AppendDefines(minsizeDefines,target.GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"), 0); this->AppendDefines(debugrelDefines,target.GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"), 0); - - this->AppendDefines(flags, defines.c_str(), 0); - this->AppendDefines(flagsDebug, debugDefines.c_str(), 0); - this->AppendDefines(flagsRelease, releaseDefines.c_str(), 0); - this->AppendDefines(flagsMinSize, minsizeDefines.c_str(), 0); - this->AppendDefines(flagsDebugRel, debugrelDefines.c_str(), 0); - + flags += defines; + flagsDebug += debugDefines; + flagsRelease += releaseDefines; + flagsMinSize += minsizeDefines; + flagsDebugRel += debugrelDefines; + // The template files have CXX FLAGS in them, that need to be replaced. // There are not separate CXX and C template files, so we use the same // variable names. The previous code sets up flags* variables to contain -- cgit v0.12