diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 08681904ab..feeae95356 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -9046,6 +9046,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( diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index b51af0b54d..c6bb3df9a0 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); } } diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 2d5ae81635..5cb87a8dff 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2961,6 +2961,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()); @@ -3265,6 +3266,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_$>"); diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 39ac1b4213..8213274eb6 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1914,6 +1914,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; }