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/cmGeneratorTarget.h | |
| 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/cmGeneratorTarget.h')
| -rw-r--r-- | Source/cmGeneratorTarget.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index f70b969..336c91f 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -11,6 +11,7 @@ #include <set> #include <string> #include <unordered_map> +#include <unordered_set> #include <utility> #include <vector> @@ -99,7 +100,8 @@ public: SourceKindModuleDefinition, SourceKindObjectSource, SourceKindResx, - SourceKindXaml + SourceKindXaml, + SourceKindUnityBatched }; /** A source file paired with a kind (classification). */ @@ -477,6 +479,9 @@ public: std::string GetPchUseCompileOptions(const std::string& config, const std::string& language); + void AddSourceFileToUnityBatch(const std::string& sourceFilename); + bool IsSourceFilePartOfUnityBatch(const std::string& sourceFilename) const; + bool IsSystemIncludeDirectory(const std::string& dir, const std::string& config, const std::string& language) const; @@ -902,6 +907,8 @@ private: mutable std::map<std::string, std::string> PchCreateCompileOptions; mutable std::map<std::string, std::string> PchUseCompileOptions; + std::unordered_set<std::string> UnityBatchedSourceFiles; + void ExpandLinkItems(std::string const& prop, std::string const& value, std::string const& config, const cmGeneratorTarget* headTarget, |