diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-08 13:51:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-08 13:51:23 (GMT) |
| commit | 8acf5b78efe995662a832952e514fce09ace03fa (patch) | |
| tree | 13304df0077e17fb7cf43be84e7f00f19cf565f1 | |
| parent | e9286c9e0f7b059cd2ba3da1bf392ab5cc70e4e3 (diff) | |
| parent | e438693e953b77ca12339f664518e28283c7ec64 (diff) | |
| download | CMake-8acf5b78efe995662a832952e514fce09ace03fa.zip CMake-8acf5b78efe995662a832952e514fce09ace03fa.tar.gz CMake-8acf5b78efe995662a832952e514fce09ace03fa.tar.bz2 | |
Merge topic 'csharp_support_options_isdebug'
e438693e VS: Teach option map IsDebug() method about C# projects
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 12 | ||||
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.h | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index 62200ce..c0913e6 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -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 diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h index e27c5d3..ab6b8cc 100644 --- a/Source/cmVisualStudioGeneratorOptions.h +++ b/Source/cmVisualStudioGeneratorOptions.h @@ -28,7 +28,8 @@ public: ResourceCompiler, MasmCompiler, Linker, - FortranCompiler + FortranCompiler, + CSharpCompiler }; cmVisualStudioGeneratorOptions(cmLocalVisualStudioGenerator* lg, Tool tool, cmVS7FlagTable const* table, |