Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

VS: set ScanSourceForModuleDependencies at vcxproj level

Browse Source 
Implement the target-wide `CXX_SCAN_FOR_MODULES`/`CMP0155` selection
with the `.vcxproj`-wide `ScanSourceForModuleDependencies` setting.
Set the per-source equivalent only when needed for a per-source
`CXX_SCAN_FOR_MODULES` property.

This approach enables Intellisense for interfaces imported from modules.
It is also more consistent with what a user might expect when
investigating the state of module scanning from the VS property panels.

Fixes: #25806
Fixes: #25947
This commit is contained in:
Ben Boeckel
2024-04-27 18:40:14 -04:00
committed by Brad King
parent dff511ad28
commit 3022f0363f
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -281,6 +281,16 @@ cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator(
this->Makefile->GetGeneratorConfigs(cmMakefile::ExcludeEmptyConfig); this->Makefile->GetGeneratorConfigs(cmMakefile::ExcludeEmptyConfig);
this->NsightTegra = gg->IsNsightTegra(); this->NsightTegra = gg->IsNsightTegra();
this->Android = gg->TargetsAndroid(); this->Android = gg->TargetsAndroid();
auto scanProp = target->GetProperty("CXX_SCAN_FOR_MODULES");
for (auto const& config : this->Configurations) {
if (scanProp.IsSet()) {
this->ScanSourceForModuleDependencies[config] = scanProp.IsOn();
} else {
this->ScanSourceForModuleDependencies[config] =
target->NeedCxxDyndep(config) ==
cmGeneratorTarget::CxxModuleSupport::Enabled;
}
}
for (unsigned int& version : this->NsightTegraVersion) { for (unsigned int& version : this->NsightTegraVersion) {
version = 0; version = 0;
} }
@@ -2827,7 +2837,9 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
// use them // use them
if (!flags.empty() || !options.empty() || !configDefines.empty() || if (!flags.empty() || !options.empty() || !configDefines.empty() ||
!includes.empty() || compileAsPerConfig || noWinRT || !includes.empty() || compileAsPerConfig || noWinRT ||
!options.empty() || needsPCHFlags || shouldScanForModules) { !options.empty() || needsPCHFlags ||
(shouldScanForModules !=
this->ScanSourceForModuleDependencies[config])) {
cmGlobalVisualStudio10Generator* gg = this->GlobalGenerator; cmGlobalVisualStudio10Generator* gg = this->GlobalGenerator;
cmIDEFlagTable const* flagtable = nullptr; cmIDEFlagTable const* flagtable = nullptr;
const std::string& srclang = source->GetLanguage(); const std::string& srclang = source->GetLanguage();
@@ -2855,8 +2867,10 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
if (compileAsPerConfig) { if (compileAsPerConfig) {
clOptions.AddFlag("CompileAs", compileAsPerConfig); clOptions.AddFlag("CompileAs", compileAsPerConfig);
} }
if (shouldScanForModules) { if (shouldScanForModules !=
clOptions.AddFlag("ScanSourceForModuleDependencies", "true"); this->ScanSourceForModuleDependencies[config]) {
clOptions.AddFlag("ScanSourceForModuleDependencies",
shouldScanForModules ? "true" : "false");
} }
if (noWinRT) { if (noWinRT) {
clOptions.AddFlag("CompileAsWinRT", "false"); clOptions.AddFlag("CompileAsWinRT", "false");
@@ -3563,8 +3577,9 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
} }
} }
// Disable C++ source scanning by default. e2.Element("ScanSourceForModuleDependencies",
e2.Element("ScanSourceForModuleDependencies", "false"); this->ScanSourceForModuleDependencies[configName] ? "true"
: "false");
} }
bool cmVisualStudio10TargetGenerator::ComputeRcOptions() bool cmVisualStudio10TargetGenerator::ComputeRcOptions()

1
Source/cmVisualStudio10TargetGenerator.h
View File

@@ -238,6 +238,7 @@ private:
bool NsightTegra; bool NsightTegra;
bool Android; bool Android;
bool HaveCustomCommandDepfile = false; bool HaveCustomCommandDepfile = false;
std::map<std::string, bool> ScanSourceForModuleDependencies;
unsigned int NsightTegraVersion[4]; unsigned int NsightTegraVersion[4];
bool TargetCompileAsWinRT; bool TargetCompileAsWinRT;
std::set<std::string> IPOEnabledConfigurations; std::set<std::string> IPOEnabledConfigurations;