[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2473-ga283410
Stephen Kelly
steveire at gmail.com
Fri Apr 18 07:29:26 EDT 2014
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 a283410f35bf7e36b5cce74ddc3e36d3b1d0336b (commit)
via 90115a9b4b452ce49d68e662d651875660392133 (commit)
from d53b4a98b323196929d80b5bd88c114fca0fd6f3 (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=a283410f35bf7e36b5cce74ddc3e36d3b1d0336b
commit a283410f35bf7e36b5cce74ddc3e36d3b1d0336b
Merge: d53b4a9 90115a9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 07:29:26 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 07:29:26 2014 -0400
Merge topic 'autorcc-target-dir' into next
90115a9b Make the directory before writing to it.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90115a9b4b452ce49d68e662d651875660392133
commit 90115a9b4b452ce49d68e662d651875660392133
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 13:28:44 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 18 13:28:44 2014 +0200
Make the directory before writing to it.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 74326f3..57f9595 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -508,7 +508,9 @@ void cmQtAutoGenerators::SetupSourceFiles(cmTarget const* target)
std::string basename = cmsys::SystemTools::
GetFilenameWithoutLastExtension(absFile);
- std::string rcc_output_file = target->GetSupportDirectory();
+ std::string rcc_output_dir = target->GetSupportDirectory();
+ cmSystemTools::MakeDirectory(rcc_output_dir);
+ std::string rcc_output_file = rcc_output_dir;
rcc_output_file += "/qrc_" + basename + ".cpp";
makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
rcc_output_file.c_str(), false);
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list