[Cmake-commits] CMake branch, master, updated. ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c (commit)
      from  2e25606a48f1867a5e328216b8f4a23f43ce329b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c
commit ed5a140aa4e00d9f0f5bbb29e0e6249c161b989c
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue May 11 09:34:12 2010 -0400

    Fix for Bug#10700, COMPILE_DEFINITIONS_MINSIZEREL missing REL part.
    
    Also remove some trailing whitespace.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 2cf840d..89bfd05 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1420,7 +1420,7 @@ void cmLocalVisualStudio6Generator
                                  outputNameDebug.c_str());
     cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELEASE", 
                                  outputNameRelease.c_str());
-    cmSystemTools::ReplaceString(line, "OUTPUT_NAME_MINSIZEREL", 
+    cmSystemTools::ReplaceString(line, "OUTPUT_NAME_MINSIZEREL",
                                  outputNameMinSizeRel.c_str());
     cmSystemTools::ReplaceString(line, "OUTPUT_NAME_RELWITHDEBINFO", 
                                  outputNameRelWithDebInfo.c_str());
@@ -1431,7 +1431,7 @@ void cmLocalVisualStudio6Generator
                                  optionsDebug.c_str());
     cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELEASE", 
                                  optionsRelease.c_str());
-    cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_MINSIZEREL", 
+    cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_MINSIZEREL",
                                  optionsMinSizeRel.c_str());
     cmSystemTools::ReplaceString(line, "CM_MULTILINE_OPTIONS_RELWITHDEBINFO", 
                                  optionsRelWithDebInfo.c_str());
@@ -1619,7 +1619,7 @@ void cmLocalVisualStudio6Generator
     // 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
     // the correct C or CXX flags
-    cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL", 
+    cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL",
                                  flagsMinSize.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG", 
                                  flagsDebug.c_str());
@@ -1629,7 +1629,7 @@ void cmLocalVisualStudio6Generator
                                  flagsRelease.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
 
-    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_MINSIZE", 
+    cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_MINSIZEREL",
                                  minsizeDefines.c_str());
     cmSystemTools::ReplaceString(line, "COMPILE_DEFINITIONS_DEBUG", 
                                  debugDefines.c_str());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake