diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:35 (GMT) |
| commit | 9b9a57e16b22769b612d4bbe45e9b7cb936be690 (patch) | |
| tree | 4b981e6e03920279b789befe7b513769f7cdf57c /Source | |
| parent | 916b7d519557d4d11e73e66c3e9c95cdacb655ba (diff) | |
| parent | 9a34e95a41fff294a7fcd452cb3e78fd4ff021aa (diff) | |
| download | CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.zip CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.tar.gz CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.tar.bz2 | |
Merge branch 'autogen-no-generated-files' into release-3.9
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 6924ba2..cecf165 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -303,6 +303,13 @@ static void AcquireScanFiles(cmGeneratorTarget const* target, !(fileType == cmSystemTools::HEADER_FILE_FORMAT)) { continue; } + if (PropertyEnabled(sf, "GENERATED") && + !target->GetPropertyAsBool("__UNDOCUMENTED_AUTOGEN_GENERATED_FILES")) { + // FIXME: Add a policy whose NEW behavior allows generated files. + // The implementation already works. We disable it here to avoid + // changing behavior for existing projects that do not expect it. + continue; + } const std::string absFile = cmsys::SystemTools::GetRealPath(sf->GetFullPath()); // Skip flags |