diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-28 11:01:31 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-01-10 11:49:15 (GMT) |
| commit | 32d3540e090c4a24d55b99c49c094a9cb574c9b3 (patch) | |
| tree | 678fe842ca9fba56197acb35f461c374e1c943d7 /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | e7280a7f1743d73cdab41ed709a9e1d0f99b6342 (diff) | |
| download | CMake-32d3540e090c4a24d55b99c49c094a9cb574c9b3.zip CMake-32d3540e090c4a24d55b99c49c094a9cb574c9b3.tar.gz CMake-32d3540e090c4a24d55b99c49c094a9cb574c9b3.tar.bz2 | |
AUTOGEN: Initializer: Introduce SKIP_AUTOGEN checks
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 5304aec..de0c212 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -123,6 +123,9 @@ static void SetupSourceFiles(cmGeneratorTarget const* target, if (cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED"))) { continue; } + if (cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN"))) { + continue; + } const bool fileSkipUic = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOUIC")); const bool fileSkipMoc = @@ -578,7 +581,9 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target, std::string ext = sf->GetExtension(); if (ext == "qrc") { std::string absFile = cmsys::SystemTools::GetRealPath(sf->GetFullPath()); - bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC")); + const bool skip = + cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN")) || + cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC")); if (!skip) { _rcc_files += sepRccFiles; @@ -756,6 +761,7 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget( fileIt != srcFiles.end(); ++fileIt) { cmSourceFile* sf = *fileIt; if (sf->GetExtension() == "qrc" && + !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOGEN")) && !cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTORCC"))) { { const std::string absFile = |