Merge topic 'cxxmodules-dyndep-error-on-private-usage' into release-3.29
3f8a59a05c cxxmodules: return failure from the collator when private usage is found
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9257
diff --git a/Source/cmCxxModuleMapper.cxx b/Source/cmCxxModuleMapper.cxx
index f45c011..b6b9540 100644
--- a/Source/cmCxxModuleMapper.cxx
+++ b/Source/cmCxxModuleMapper.cxx
@@ -305,7 +305,7 @@
std::set<std::string> CxxModuleUsageSeed(
CxxModuleLocations const& loc, std::vector<cmScanDepInfo> const& objects,
- CxxModuleUsage& usages)
+ CxxModuleUsage& usages, bool& private_usage_found)
{
// Track inner usages to populate usages from internal bits.
//
@@ -334,6 +334,7 @@
cmStrCat("Unable to use module '", r.LogicalName,
"' as it is 'PRIVATE' and therefore not accessible outside "
"of its owning target."));
+ private_usage_found = true;
continue;
}
diff --git a/Source/cmCxxModuleMapper.h b/Source/cmCxxModuleMapper.h
index 34111f7..c785099 100644
--- a/Source/cmCxxModuleMapper.h
+++ b/Source/cmCxxModuleMapper.h
@@ -93,7 +93,7 @@
// import cycle).
std::set<std::string> CxxModuleUsageSeed(
CxxModuleLocations const& loc, std::vector<cmScanDepInfo> const& objects,
- CxxModuleUsage& usages);
+ CxxModuleUsage& usages, bool& private_usage_found);
// Return the contents of the module map in the given format for the
// object file.
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a3f20c3..f018a8c 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -2742,7 +2742,9 @@
// Insert information about the current target's modules.
if (modmap_fmt) {
- auto cycle_modules = CxxModuleUsageSeed(locs, objects, usages);
+ bool private_usage_found = false;
+ auto cycle_modules =
+ CxxModuleUsageSeed(locs, objects, usages, private_usage_found);
if (!cycle_modules.empty()) {
cmSystemTools::Error(
cmStrCat("Circular dependency detected in the C++ module import "
@@ -2750,6 +2752,10 @@
cmJoin(cycle_modules, R"(", ")"_s), '"'));
return false;
}
+ if (private_usage_found) {
+ // Already errored in the function.
+ return false;
+ }
}
cmNinjaBuild build("dyndep");
