summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-08 14:08:45 (GMT)
committerBrad King <brad.king@kitware.com>2017-08-08 14:10:09 (GMT)
commit2610c1a73321df6c18f0082aa527dbcad951cdbc (patch)
treeaeb5f0d22385b6457d578f08ed90f98e4dfe901d
parent9e2a8afb572a9d45e009e1c7d77459bacac6b310 (diff)
parent6a0605c71126b15e607cc57d3e589ffc693f5c0e (diff)
downloadCMake-2610c1a73321df6c18f0082aa527dbcad951cdbc.zip
CMake-2610c1a73321df6c18f0082aa527dbcad951cdbc.tar.gz
CMake-2610c1a73321df6c18f0082aa527dbcad951cdbc.tar.bz2
Merge branch 'autogen-create-include-dir' into release-3.9
Merge-request: !1113
-rw-r--r--Source/cmQtAutoGenerators.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 042d111..c79f66d 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -727,6 +727,17 @@ bool cmQtAutoGenerators::RunAutogen()
// moc file is included anywhere a moc_<filename>.cpp file is created and
// included in the mocs_compilation_$<CONFIG>.cpp file.
+ // Create AUTOGEN include directory
+ {
+ const std::string incDirAbs = cmSystemTools::CollapseCombinedPath(
+ this->AutogenBuildDir, this->AutogenIncludeDir);
+ if (!cmsys::SystemTools::MakeDirectory(incDirAbs)) {
+ this->LogError("AutoGen: Error: Could not create include directory " +
+ Quoted(incDirAbs));
+ return false;
+ }
+ }
+
// key = moc source filepath, value = moc output filepath
std::map<std::string, std::string> mocsIncluded;
std::map<std::string, std::string> mocsNotIncluded;