diff options
author | Sebastian Holtermann <sebholt@web.de> | 2020-01-17 11:29:13 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-01-17 14:48:35 (GMT) |
commit | 086d9b2bab926b673bcb88a87a188586e76de3d6 (patch) | |
tree | b7829c1c4322072f9b01ff064e5e1ea48f0572e0 /Source/cmQtAutoGenInitializer.h | |
parent | 512ab500f06d6c645985cc8014c5e6291b9a059f (diff) | |
download | CMake-086d9b2bab926b673bcb88a87a188586e76de3d6.zip CMake-086d9b2bab926b673bcb88a87a188586e76de3d6.tar.gz CMake-086d9b2bab926b673bcb88a87a188586e76de3d6.tar.bz2 |
Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files
`rcc` generated files are not compatible with unity builds, because they
contain classes in anonymous namespaces and static data with identical names.
This patch sets the source file property `SKIP_UNITY_BUILD_INCLUSION` to `On`
on all `AUTORCC` generated files to exclude them from unity build files.
Fixes: #20191 "QT5: Exclude resource files from unity build"
Diffstat (limited to 'Source/cmQtAutoGenInitializer.h')
-rw-r--r-- | Source/cmQtAutoGenInitializer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h index 486dab7..d55259c 100644 --- a/Source/cmQtAutoGenInitializer.h +++ b/Source/cmQtAutoGenInitializer.h @@ -129,10 +129,11 @@ private: bool SetupWriteAutogenInfo(); bool SetupWriteRccInfo(); - void RegisterGeneratedSource(std::string const& filename); - bool AddGeneratedSource(std::string const& filename, GenVarsT const& genVars, - bool prepend = false); - bool AddToSourceGroup(std::string const& fileName, + cmSourceFile* RegisterGeneratedSource(std::string const& filename); + cmSourceFile* AddGeneratedSource(std::string const& filename, + GenVarsT const& genVars, + bool prepend = false); + void AddToSourceGroup(std::string const& fileName, cm::string_view genNameUpper); void AddCleanFile(std::string const& fileName); |