[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3019-g53d8f56

[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  53d8f56f3fe18a19f8297c1a391b839d76a60da6 (commit)
       via  a288aeecd272749c1235edef9729de515e0b63ae (commit)
      from  6ba079b1f91cac951c2ef80b8d0eab6f0a0f4346 (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=53d8f56f3fe18a19f8297c1a391b839d76a60da6
commit 53d8f56f3fe18a19f8297c1a391b839d76a60da6
Merge: 6ba079b a288aee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 10:32:46 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 10 10:32:46 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    a288aee Remove commented code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a288aeecd272749c1235edef9729de515e0b63ae
commit a288aeecd272749c1235edef9729de515e0b63ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 16:32:13 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 10 16:32:13 2013 +0200

    Remove commented code.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index d5edfa1..6240054 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1338,17 +1338,6 @@ std::string cmLocalGenerator::GetIncludeFlags(
   return flags;
 }
 
-// //----------------------------------------------------------------------------
-// void cmLocalGenerator::AddCompileDefinitions(std::string& defines,
-//                                              cmTarget* target,
-//                                              const char* config)
-// {
-//   std::vector<std::string> targetDefines;
-//   target->GetCompileDefinitions(targetDefines,
-//                                config);
-//   this->AppendDefines(defines, targetDefines);
-// }
-
 //----------------------------------------------------------------------------
 void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines,
                                              cmTarget* target,
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 0547ce9..5c644d1 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -223,8 +223,6 @@ public:
                              bool stripImplicitInclDirs = true);
   void AddCompileOptions(std::string& flags, cmTarget* target,
                          const char* lang, const char* config);
-//   void AddCompileDefinitions(std::string& defines, cmTarget* target,
-//                          const char* config);
   void AddCompileDefinitions(std::set<std::string>& defines, cmTarget* target,
                          const char* config);
 

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   11 -----------
 Source/cmLocalGenerator.h   |    2 --
 2 files changed, 0 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake