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:16 (GMT) |
| commit | 5b46bc319435f429e3e616246e5e39b06f0e7fd0 (patch) | |
| tree | 9cdfdc9b88e2a50270fba541b988442e47794cc7 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 45f8b10e0c12b3e17315851afd1bcd178225ce6a (diff) | |
| parent | 9a5418320ea40d61a63fd47e5ac133c3ff780062 (diff) | |
| download | CMake-5b46bc319435f429e3e616246e5e39b06f0e7fd0.zip CMake-5b46bc319435f429e3e616246e5e39b06f0e7fd0.tar.gz CMake-5b46bc319435f429e3e616246e5e39b06f0e7fd0.tar.bz2 | |
Merge topic 'unity-HEADER_FILE_ONLY'
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 df30e7e..cb15039 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1177,7 +1177,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. |