diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-15 18:37:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-15 18:37:33 (GMT) |
| commit | 6e6f5afd0317830741d9d7bcc22bdaf67ace963d (patch) | |
| tree | 815dca6a5716ab32a574b33f4755cbf10a27405e /Source | |
| parent | c2d1e78603b5893564d47c595adf4d20c4d13ea6 (diff) | |
| parent | 274a6f3699c1ad7b099bbabf49618f23122d84f0 (diff) | |
| download | CMake-6e6f5afd0317830741d9d7bcc22bdaf67ace963d.zip CMake-6e6f5afd0317830741d9d7bcc22bdaf67ace963d.tar.gz CMake-6e6f5afd0317830741d9d7bcc22bdaf67ace963d.tar.bz2 | |
Merge topic 'unity-lang-filename'
274a6f3699 Unity Build: include language in generated source file name
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4223
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 2170d26..18f82dd 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2627,7 +2627,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) chunk = std::min(itemsLeft, batchSize); std::string filename = cmStrCat(filename_base, "unity_", batch, - (lang == "C") ? ".c" : ".cxx"); + (lang == "C") ? "_c.c" : "_cxx.cxx"); const std::string filename_tmp = cmStrCat(filename, ".tmp"); { |