diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-02 10:32:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-07 13:24:01 (GMT) |
| commit | 5c3dc7460ea6644bd658131ec474e6ddce825b1a (patch) | |
| tree | 5129edaa00c4296b130bf50bb71d07e61e4d647b /Source | |
| parent | 8c9358386b0b2826ffc3da4385474a4227477eef (diff) | |
| download | CMake-5c3dc7460ea6644bd658131ec474e6ddce825b1a.zip CMake-5c3dc7460ea6644bd658131ec474e6ddce825b1a.tar.gz CMake-5c3dc7460ea6644bd658131ec474e6ddce825b1a.tar.bz2 | |
QtAutogen: Clean removes autogen build directory
Cleaning removes the entire autogen build directory instead
of single files.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 8 |
1 files 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 |