diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-12 14:51:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 14:51:15 (GMT) |
| commit | eae743bf17605c28ee4afd02991d3271efb5c8a9 (patch) | |
| tree | d2a32c6d4fa109705b2a559da1234683e234f6c8 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 88e0dca40df9c88e7d9b9d352fe19f63091bc7c3 (diff) | |
| parent | 9a5418320ea40d61a63fd47e5ac133c3ff780062 (diff) | |
| download | CMake-eae743bf17605c28ee4afd02991d3271efb5c8a9.zip CMake-eae743bf17605c28ee4afd02991d3271efb5c8a9.tar.gz CMake-eae743bf17605c28ee4afd02991d3271efb5c8a9.tar.bz2 | |
Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16
9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4023
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index c457cd1..6cbd4f3 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1174,7 +1174,9 @@ bool cmGlobalXCodeGenerator::CreateXCodeTarget( headerFiles.push_back(xsf); } else if (tsFlags.Type == cmGeneratorTarget::SourceFileTypeResource) { resourceFiles.push_back(xsf); - } else if (!sourceFile->GetPropertyAsBool("HEADER_FILE_ONLY")) { + } else if (!sourceFile->GetPropertyAsBool("HEADER_FILE_ONLY") && + !gtgt->IsSourceFilePartOfUnityBatch( + sourceFile->ResolveFullPath())) { // Include this file in the build if it has a known language // and has not been listed as an ignored extension for this // generator. |