[Cmake-commits] CMake branch, next, updated. v2.8.11-2266-g0eec0ae

[Stephen Kelly]

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, next has been updated
       via  0eec0ae6d47ca4bec4fa631e27cff598db2db621 (commit)
       via  ad945e08a41207859f40979069eaf720f74d9a99 (commit)
       via  8b29b88a478d71185dc829f7f8694663ee779386 (commit)
      from  c25faab77b8bda94ea1bd6dbf4a7b3823332d21e (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=0eec0ae6d47ca4bec4fa631e27cff598db2db621
commit 0eec0ae6d47ca4bec4fa631e27cff598db2db621
Merge: c25faab ad945e0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 28 11:45:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 28 11:45:59 2013 -0400

    Merge topic 'target-COMPILE_OPTIONS' into next
    
    ad945e0 VS6: Rename some variables to correspond to config values.
    8b29b88 Fix use of new GetCompileOptions API.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad945e08a41207859f40979069eaf720f74d9a99
commit ad945e08a41207859f40979069eaf720f74d9a99
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 28 17:44:35 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 28 17:44:35 2013 +0200

    VS6: Rename some variables to correspond to config values.
    
    This simplifies population of the compile flags.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 18b17a1..4c78f7f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1639,9 +1639,9 @@ void cmLocalVisualStudio6Generator
     // store flags for each configuration
     std::string flags = " ";
     std::string flagsRelease = " ";
-    std::string flagsMinSize = " ";
+    std::string flagsMinSizeRel = " ";
     std::string flagsDebug = " ";
-    std::string flagsDebugRel = " ";
+    std::string flagsRelWithDebInfo = " ";
     if(target.GetType() >= cmTarget::EXECUTABLE &&
        target.GetType() <= cmTarget::OBJECT_LIBRARY)
       {
@@ -1664,16 +1664,16 @@ void cmLocalVisualStudio6Generator
       flagsRelease += " -DCMAKE_INTDIR=\\\"Release\\\" ";
 
       flagVar = baseFlagVar + "_MINSIZEREL";
-      flagsMinSize = this->Makefile->GetSafeDefinition(flagVar.c_str());
-      flagsMinSize += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
+      flagsMinSizeRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
+      flagsMinSizeRel += " -DCMAKE_INTDIR=\\\"MinSizeRel\\\" ";
 
       flagVar = baseFlagVar + "_DEBUG";
       flagsDebug = this->Makefile->GetSafeDefinition(flagVar.c_str());
       flagsDebug += " -DCMAKE_INTDIR=\\\"Debug\\\" ";
 
       flagVar = baseFlagVar + "_RELWITHDEBINFO";
-      flagsDebugRel = this->Makefile->GetSafeDefinition(flagVar.c_str());
-      flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
+      flagsRelWithDebInfo = this->Makefile->GetSafeDefinition(flagVar.c_str());
+      flagsRelWithDebInfo += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
       }
 
     // if _UNICODE and _SBCS are not found, then add -D_MBCS
@@ -1750,19 +1750,19 @@ void cmLocalVisualStudio6Generator
     flags += defines;
     flagsDebug += debugDefines;
     flagsRelease += releaseDefines;
-    flagsMinSize += minsizeDefines;
-    flagsDebugRel += debugrelDefines;
+    flagsMinSizeRel += minsizeDefines;
+    flagsRelWithDebInfo += 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
     // the correct C or CXX flags
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_MINSIZEREL",
-                                 flagsMinSize.c_str());
+                                 flagsMinSizeRel.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_DEBUG",
                                  flagsDebug.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELWITHDEBINFO",
-                                 flagsDebugRel.c_str());
+                                 flagsRelWithDebInfo.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS_RELEASE",
                                  flagsRelease.c_str());
     cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b29b88a478d71185dc829f7f8694663ee779386
commit 8b29b88a478d71185dc829f7f8694663ee779386
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 28 17:44:14 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 28 17:44:14 2013 +0200

    Fix use of new GetCompileOptions API.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 46d15d1..18b17a1 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1687,7 +1687,8 @@ void cmLocalVisualStudio6Generator
       }
 
     {
-    std::string targetFlags = this->GetCompileOptions(targetFlags, &target, 0);
+    std::string targetFlags;
+    this->GetCompileOptions(targetFlags, &target, 0);
     // Add per-target flags.
     if(!targetFlags.empty())
       {
@@ -1697,7 +1698,8 @@ void cmLocalVisualStudio6Generator
     }
 #define ADD_FLAGS(CONFIG) \
     { \
-    std::string targetFlags = this->GetCompileOptions(targetFlags, &target, #CONFIG); \
+    std::string targetFlags; \
+    this->GetCompileOptions(targetFlags, &target, #CONFIG); \
     if(!targetFlags.empty()) \
       { \
       flags ## CONFIG += " "; \

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

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


hooks/post-receive
-- 
CMake