diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-12-04 13:57:27 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-12-04 13:57:27 (GMT) |
| commit | 68cf9e0a0df1cf40ee5da0f25057a82b31d97ec3 (patch) | |
| tree | 5b41cd2c1a5bab91751b1fd79ffd992d82819bbe /Source/cmLocalVisualStudio6Generator.cxx | |
| parent | e3ff95af210c3378c56fdc75760b2bf457886036 (diff) | |
| download | CMake-68cf9e0a0df1cf40ee5da0f25057a82b31d97ec3.zip CMake-68cf9e0a0df1cf40ee5da0f25057a82b31d97ec3.tar.gz CMake-68cf9e0a0df1cf40ee5da0f25057a82b31d97ec3.tar.bz2 | |
BUG: fix for bug #8216
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 13 |
1 files 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 |