Merge topic 'csharp_support_options_isdebug'

e438693e VS: Teach option map IsDebug() method about C# projects
This commit is contained in:
Brad King
2016-12-08 08:51:23 -05:00
committed by CMake Topic Stage
2 changed files with 13 additions and 2 deletions
+11 -1
View File
@@ -130,7 +130,17 @@ void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose)
bool cmVisualStudioGeneratorOptions::IsDebug() const
{
return this->FlagMap.find("DebugInformationFormat") != this->FlagMap.end();
if (this->CurrentTool != CSharpCompiler) {
return this->FlagMap.find("DebugInformationFormat") != this->FlagMap.end();
}
std::map<std::string, FlagValue>::const_iterator i =
this->FlagMap.find("DebugType");
if (i != this->FlagMap.end()) {
if (i->second.size() == 1) {
return i->second[0] != "none";
}
}
return false;
}
bool cmVisualStudioGeneratorOptions::IsWinRt() const
+2 -1
View File
@@ -28,7 +28,8 @@ public:
ResourceCompiler,
MasmCompiler,
Linker,
FortranCompiler
FortranCompiler,
CSharpCompiler
};
cmVisualStudioGeneratorOptions(cmLocalVisualStudioGenerator* lg, Tool tool,
cmVS7FlagTable const* table,