[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2475-g938b69b

[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  938b69bc28dcd6de2ca439d39b13671744005f2e (commit)
       via  6634f1b5289c08e6bdf1b34414b27015c815c160 (commit)
      from  a283410f35bf7e36b5cce74ddc3e36d3b1d0336b (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=938b69bc28dcd6de2ca439d39b13671744005f2e
commit 938b69bc28dcd6de2ca439d39b13671744005f2e
Merge: a283410 6634f1b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 07:34:25 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 07:34:25 2014 -0400

    Merge topic 'autorcc-target-dir' into next
    
    6634f1b5 Add c_str.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6634f1b5289c08e6bdf1b34414b27015c815c160
commit 6634f1b5289c08e6bdf1b34414b27015c815c160
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 13:34:08 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 18 13:34:08 2014 +0200

    Add c_str.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 57f9595..cc6932d 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -509,7 +509,7 @@ void cmQtAutoGenerators::SetupSourceFiles(cmTarget const* target)
                                       GetFilenameWithoutLastExtension(absFile);
 
         std::string rcc_output_dir = target->GetSupportDirectory();
-        cmSystemTools::MakeDirectory(rcc_output_dir);
+        cmSystemTools::MakeDirectory(rcc_output_dir.c_str());
         std::string rcc_output_file = rcc_output_dir;
         rcc_output_file += "/qrc_" + basename + ".cpp";
         makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake