diff --git a/Source/cmCxxModuleMapper.cxx b/Source/cmCxxModuleMapper.cxx index f45c011030..b6b95404ed 100644 --- a/Source/cmCxxModuleMapper.cxx +++ b/Source/cmCxxModuleMapper.cxx @@ -305,7 +305,7 @@ cm::static_string_view CxxModuleMapExtension( std::set CxxModuleUsageSeed( CxxModuleLocations const& loc, std::vector const& objects, - CxxModuleUsage& usages) + CxxModuleUsage& usages, bool& private_usage_found) { // Track inner usages to populate usages from internal bits. // @@ -334,6 +334,7 @@ std::set CxxModuleUsageSeed( 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 34111f7f77..c7850994f9 100644 --- a/Source/cmCxxModuleMapper.h +++ b/Source/cmCxxModuleMapper.h @@ -93,7 +93,7 @@ cm::static_string_view CxxModuleMapExtension( // import cycle). std::set CxxModuleUsageSeed( CxxModuleLocations const& loc, std::vector 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 22fd90dd9e..b74ba373a1 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -2719,7 +2719,9 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile( // 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 " @@ -2727,6 +2729,10 @@ bool cmGlobalNinjaGenerator::WriteDyndepFile( cmJoin(cycle_modules, R"(", ")"_s), '"')); return false; } + if (private_usage_found) { + // Already errored in the function. + return false; + } } cmNinjaBuild build("dyndep");