From 4fd596c34c16a130d1550d4516078e6ec00ec629 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 11 Dec 2023 07:52:31 -0500 Subject: cmGeneratorTarget: disable C++ module scanning for verify targets --- Source/cmGeneratorTarget.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 45073f7..8af92e5 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -8948,6 +8948,7 @@ bool cmGeneratorTarget::AddHeaderSetVerification() verifyTarget->SetProperty("AUTOUIC", "OFF"); verifyTarget->SetProperty("DISABLE_PRECOMPILE_HEADERS", "ON"); verifyTarget->SetProperty("UNITY_BUILD", "OFF"); + verifyTarget->SetProperty("CXX_SCAN_FOR_MODULES", "OFF"); cm::optional> perConfigCompileDefinitions; verifyTarget->FinalizeTargetConfiguration( -- cgit v0.12 From e5dce1a37ed89bbf4a499ff8b02be327b3cb59a4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 11 Dec 2023 07:52:50 -0500 Subject: cmQtAutoGenInitializer: disable C++ module scanning for autogen sources --- Source/cmQtAutoGenInitializer.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 81752a6..50b0ebe 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1878,6 +1878,7 @@ cmSourceFile* cmQtAutoGenInitializer::RegisterGeneratedSource( gFile->MarkAsGenerated(); gFile->SetProperty("SKIP_AUTOGEN", "1"); gFile->SetProperty("SKIP_LINTING", "ON"); + gFile->SetProperty("CXX_SCAN_FOR_MODULES", "0"); return gFile; } -- cgit v0.12 From fa9a72a788ee5b1d8f1aa6dd7d19db3e118b8939 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 11 Dec 2023 07:53:13 -0500 Subject: cmLocalGenerator: disable C++ module scanning for copied PCH sources --- Source/cmLocalGenerator.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index caac535..a3003bd 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2928,6 +2928,7 @@ void cmLocalGenerator::CopyPchCompilePdb( } else { cc->SetOutputs(outputs); cmSourceFile* copy_rule = this->AddCustomCommandToOutput(std::move(cc)); + copy_rule->SetProperty("CXX_SCAN_FOR_MODULES", "0"); if (copy_rule) { target->AddSource(copy_rule->ResolveFullPath()); -- cgit v0.12 From 9e19a61ddb42208ea9ff14bc5ec1f5faaa0bdeee Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 11 Dec 2023 07:53:40 -0500 Subject: cmLocalGenerator: disable C++ module scanning for unity sources --- Source/cmLocalGenerator.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index a3003bd..168cd41 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -3196,6 +3196,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) target->AddSource(file.Path, true); unity->SetProperty("SKIP_UNITY_BUILD_INCLUSION", "ON"); unity->SetProperty("UNITY_SOURCE_FILE", file.Path); + unity->SetProperty("CXX_SCAN_FOR_MODULES", "0"); if (file.PerConfig) { unity->SetProperty("COMPILE_DEFINITIONS", "CMAKE_UNITY_CONFIG_$>"); -- cgit v0.12 From 91b7bf59a7a6912653c2ced0dc53fa28050d358e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 11 Dec 2023 07:54:03 -0500 Subject: cmGlobalXCodeGenerator: disable C++ module scanning for force-lang files --- Source/cmGlobalXCodeGenerator.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ec2550a..72dba42 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1697,6 +1697,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmGeneratorTarget* gtgt) } if (cmSourceFile* sf = mf->GetOrCreateSource(fname)) { sf->SetProperty("LANGUAGE", llang); + sf->SetProperty("CXX_SCAN_FOR_MODULES", "0"); gtgt->AddSource(fname); } } -- cgit v0.12