[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5412-gb2f810b

Stephen Kelly steveire at gmail.com
Tue Nov 19 13:07:47 EST 2013


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  b2f810b02185cfa2e3ecf262c02c88a2831d76d8 (commit)
       via  948baa1558be76ecf7be7c19931b9ab3a5256a4d (commit)
      from  4c845dd619c94b026d038f42ba8c40a3195b932e (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=b2f810b02185cfa2e3ecf262c02c88a2831d76d8
commit b2f810b02185cfa2e3ecf262c02c88a2831d76d8
Merge: 4c845dd 948baa1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 13:07:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 13:07:46 2013 -0500

    Merge topic 'constify' into next
    
    948baa1 Fix VS10 generator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=948baa1558be76ecf7be7c19931b9ab3a5256a4d
commit 948baa1558be76ecf7be7c19931b9ab3a5256a4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 19:06:45 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 19:06:45 2013 +0100

    Fix VS10 generator.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index ace1eef..3835ac9 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1794,7 +1794,7 @@ cmVisualStudio10TargetGenerator::WriteEvents(std::string const& configName)
 
 void cmVisualStudio10TargetGenerator::WriteEvent(
   const char* name,
-  std::vector<cmCustomCommand> & commands,
+  std::vector<cmCustomCommand> const& commands,
   std::string const& configName)
 {
   if(commands.size() == 0)
@@ -1807,7 +1807,7 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
   std::string script;
   const char* pre = "";
   std::string comment;
-  for(std::vector<cmCustomCommand>::iterator i = commands.begin();
+  for(std::vector<cmCustomCommand>::const_iterator i = commands.begin();
       i != commands.end(); ++i)
     {
     cmCustomCommand& command = *i;
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index 9a480a8..5f012d9 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -87,7 +87,7 @@ private:
   void AddLibraries(cmComputeLinkInformation& cli, std::string& libstring);
   void WriteLibOptions(std::string const& config);
   void WriteEvents(std::string const& configName);
-  void WriteEvent(const char* name, std::vector<cmCustomCommand> & commands,
+  void WriteEvent(const char* name, std::vector<cmCustomCommand> const& commands,
                   std::string const& configName);
   void WriteGroupSources(const char* name, ToolSources const& sources,
                          std::vector<cmSourceGroup>& );

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    4 ++--
 Source/cmVisualStudio10TargetGenerator.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list