[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2083-g7eaa83e

[Robert Maynard]

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  7eaa83e27fbf4b9e61148284802d11d5a463fb80 (commit)
       via  44dffaf024eb57f399fef7467967dea8dcf170c0 (commit)
      from  3bb7607b315bc1ffc060a2f7bc4d8e2cc601cabd (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=7eaa83e27fbf4b9e61148284802d11d5a463fb80
commit 7eaa83e27fbf4b9e61148284802d11d5a463fb80
Merge: 3bb7607 44dffaf
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Feb 11 17:43:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 11 17:43:38 2013 -0500

    Merge topic 'sublimeText2Generator' into next
    
    44dffaf Update generator to use new cmGeneratorTarget api.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44dffaf024eb57f399fef7467967dea8dcf170c0
commit 44dffaf024eb57f399fef7467967dea8dcf170c0
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Feb 11 17:23:02 2013 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Feb 11 17:38:45 2013 -0500

    Update generator to use new cmGeneratorTarget api.

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index ef29329..5431401 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -11,14 +11,16 @@
   See the License for more information.
 ============================================================================*/
 #include "cmExtraSublimeTextGenerator.h"
+#include "cmake.h"
+#include "cmGeneratedFileStream.h"
+#include "cmGeneratorTarget.h"
 #include "cmGlobalUnixMakefileGenerator3.h"
+#include "cmLocalGenerator.h"
 #include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
-#include "cmake.h"
 #include "cmSourceFile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmTarget.h"
 #include "cmSystemTools.h"
+#include "cmTarget.h"
 #include "cmXMLSafe.h"
 
 #include <cmsys/SystemTools.hxx>
@@ -253,10 +255,11 @@ void cmExtraSublimeTextGenerator::
                cmTarget* target,
                const char* make,
                const cmMakefile* makefile,
-               const char* compiler,
+               const char*, //compiler
                MapSourceFileFlags& sourceFileFlags,
                bool firstTarget)
 {
+
   if (target != 0)
     {
       cmGeneratorTarget *gtgt = this->GlobalGenerator
@@ -426,7 +429,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
   lg->AppendFlags(flags, makefile->GetDefineFlags());
 
   // Add target-specific flags.
-  if(gtgt->GetProperty("COMPILE_FLAGS"))
+  if(target->GetProperty("COMPILE_FLAGS"))
     {
     std::string langIncludeExpr = "CMAKE_";
     langIncludeExpr += language;
@@ -437,7 +440,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
       cmsys::RegularExpression r(regex);
       std::vector<std::string> args;
       cmSystemTools::
-        ParseWindowsCommandLine(gtgt->GetProperty("COMPILE_FLAGS"), args);
+        ParseWindowsCommandLine(target->GetProperty("COMPILE_FLAGS"), args);
       for(std::vector<std::string>::iterator i = args.begin();
           i != args.end(); ++i)
         {
@@ -449,12 +452,12 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
       }
     else
       {
-      lg->AppendFlags(flags, gtgt->GetProperty("COMPILE_FLAGS"));
+      lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
       }
     }
 
   // Add source file specific flags.
-  lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS"));
+  lg->AppendFlags(flags, target->GetProperty("COMPILE_FLAGS"));
 
   // TODO: Handle Apple frameworks.
 
@@ -466,7 +469,7 @@ cmExtraSublimeTextGenerator::ComputeFlagsForObject(cmSourceFile* source,
 std::string
 cmExtraSublimeTextGenerator::
 ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
-               cmGeneratorTarget* gtgt)
+               cmGeneratorTarget*)
 
 {
   std::set<std::string> defines;
@@ -485,12 +488,12 @@ ComputeDefines(cmSourceFile *source, cmLocalGenerator* lg, cmTarget *target,
     }
 
   // Add preprocessor definitions for this target and configuration.
-  lg->AppendDefines(defines, gtgt->GetCompileDefinitions());
+  lg->AppendDefines(defines, target->GetCompileDefinitions());
   lg->AppendDefines(defines, source->GetProperty("COMPILE_DEFINITIONS"));
   {
   std::string defPropName = "COMPILE_DEFINITIONS_";
   defPropName += cmSystemTools::UpperCase(config);
-  lg->AppendDefines(defines, gtgt->GetCompileDefinitions(config));
+  lg->AppendDefines(defines, target->GetCompileDefinitions(config));
   lg->AppendDefines(defines, source->GetProperty(defPropName.c_str()));
   }
 

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

Summary of changes:
 Source/cmExtraSublimeTextGenerator.cxx |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake