From 5c3dc7460ea6644bd658131ec474e6ddce825b1a Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Fri, 2 Dec 2016 11:32:12 +0100 Subject: QtAutogen: Clean removes autogen build directory Cleaning removes the entire autogen build directory instead of single files. --- Source/cmQtAutoGeneratorInitializer.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index bc75c59..b12045c 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -122,8 +122,6 @@ static void SetupSourceFiles(cmGeneratorTarget const* target, cmsys::SystemTools::GetFilenameWithoutLastExtension(absFile); rccOutputFile += ".cpp"; - makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", - rccOutputFile.c_str(), false); makefile->GetOrCreateSource(rccOutputFile, true); newRccFiles.push_back(rccOutputFile); @@ -661,9 +659,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenSources( const std::string mocCppFile = GetAutogenTargetBuildDir(target) + "moc_compilation.cpp"; makefile->GetOrCreateSource(mocCppFile, true); - makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", mocCppFile.c_str(), - false); - target->AddSource(mocCppFile); } } @@ -686,6 +681,9 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget( // Create autogen target build directory cmSystemTools::MakeDirectory(autogenBuildDir); + // Remove entire autogen build directory on clean + makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", + autogenBuildDir.c_str(), false); // Create autogen target includes directory and // add it to the origin target INCLUDE_DIRECTORIES -- cgit v0.12