This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 09219634e58399eef76e06afd2a74caeb93cf905 (commit) via e438693e953b77ca12339f664518e28283c7ec64 (commit) from a43fa8ec70b589cb1794850cdeb147c271f88066 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09219634e58399eef76e06afd2a74caeb93cf905 commit 09219634e58399eef76e06afd2a74caeb93cf905 Merge: a43fa8e e438693 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Dec 7 12:23:38 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Dec 7 12:23:38 2016 -0500 Merge topic 'csharp_support_options_isdebug' into next e438693e VS: Teach option map IsDebug() method about C# projects https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e438693e953b77ca12339f664518e28283c7ec64 commit e438693e953b77ca12339f664518e28283c7ec64 Author: Michael Stürmer <michael.stuer...@schaeffler.com> AuthorDate: Wed Dec 7 12:48:49 2016 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Dec 7 11:49:43 2016 -0500 VS: Teach option map IsDebug() method about C# projects 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, ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudioGeneratorOptions.cxx | 12 +++++++++++- Source/cmVisualStudioGeneratorOptions.h | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits