[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2726-gbbbd47c

[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  bbbd47ce5da77884b0410d687f306fb1c52f886c (commit)
       via  7b7dd69023a062d579a31162b10db63558437432 (commit)
      from  fb3e38b4ba8732324737f59c5ff3a1c33bc7207c (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=bbbd47ce5da77884b0410d687f306fb1c52f886c
commit bbbd47ce5da77884b0410d687f306fb1c52f886c
Merge: fb3e38b 7b7dd69
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:07:48 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 24 11:07:48 2013 -0400

    Merge topic '13582_configured_file_regeneration' into next
    
    7b7dd69 cmMakefile: Pass std::string instead of a const char*.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b7dd69023a062d579a31162b10db63558437432
commit 7b7dd69023a062d579a31162b10db63558437432
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:06:36 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jun 24 11:06:54 2013 -0400

    cmMakefile: Pass std::string instead of a const char*.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a6d61e5..f3a66ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,7 +3369,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
     }
   std::string soutfile = outfile;
   std::string sinfile = infile;
-  this->AddCMakeDependFile(infile);
+  this->AddCMakeDependFile(sinfile);
   cmSystemTools::ConvertToUnixSlashes(soutfile);
   this->AddCMakeOutputFile(soutfile);
   mode_t perm = 0;

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

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake