diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-16 14:26:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-16 14:26:49 (GMT) |
| commit | 00fcb1dc812dd9578be831156e4c60c458af16c2 (patch) | |
| tree | c54801d58845cf8f94c7f2f847c087c96caf9c99 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 97132612f63b488e0b8b0913e486083b0e206154 (diff) | |
| parent | 60a8736378bbef58688c8a3dbfb2d0bce6aa1b6b (diff) | |
| download | CMake-00fcb1dc812dd9578be831156e4c60c458af16c2.zip CMake-00fcb1dc812dd9578be831156e4c60c458af16c2.tar.gz CMake-00fcb1dc812dd9578be831156e4c60c458af16c2.tar.bz2 | |
Merge topic 'cxxmodules-visibility-change-rebuild' into release-3.29
60a8736378 cmNinjaTargetGenerator: scanning depends on the module metadata
52036ce090 Tests/CXXModules: test that objects depend on dependent modules json files
9a45c9fbd5 cmNinjaTargetGenerator: use `emplace_back` for scanning deps
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9247
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index d7239f5..fe2cc04 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1222,11 +1222,13 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements( cmNinjaBuild build(this->LanguageDyndepRule(language, config)); build.Outputs.push_back(this->GetDyndepFilePath(language, config)); - build.ImplicitOuts.push_back( + build.ImplicitOuts.emplace_back( cmStrCat(this->Makefile->GetCurrentBinaryDirectory(), '/', this->LocalGenerator->GetTargetDirectory(this->GeneratorTarget), this->GetGlobalGenerator()->ConfigDirectory(config), '/', language, "Modules.json")); + build.ImplicitDeps.emplace_back( + this->GetTargetDependInfoPath(language, config)); for (auto const& scanFiles : scanningFiles) { if (!scanFiles.ScanningOutput.empty()) { build.ExplicitDeps.push_back(scanFiles.ScanningOutput); @@ -1241,10 +1243,12 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements( auto const linked_directories = this->GetLinkedTargetDirectories(language, config); for (std::string const& l : linked_directories.Direct) { - build.ImplicitDeps.push_back(cmStrCat(l, '/', language, "Modules.json")); + build.ImplicitDeps.emplace_back( + cmStrCat(l, '/', language, "Modules.json")); } for (std::string const& l : linked_directories.Forward) { - build.ImplicitDeps.push_back(cmStrCat(l, '/', language, "Modules.json")); + build.ImplicitDeps.emplace_back( + cmStrCat(l, '/', language, "Modules.json")); } this->GetGlobalGenerator()->WriteBuild(this->GetImplFileStream(fileConfig), |