diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-05 13:13:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-05 13:13:34 (GMT) |
| commit | 0b7822f49aef20ad758c637abe813463652cf9b0 (patch) | |
| tree | b94f4406fe8f3ef456c6362d6d604dd31baf1c53 | |
| parent | b8e7af979d3d6dfef05fcebefe18907963221220 (diff) | |
| parent | 21541bb5ccde705afa8400a9a2b6f4454580fa5e (diff) | |
| download | CMake-0b7822f49aef20ad758c637abe813463652cf9b0.zip CMake-0b7822f49aef20ad758c637abe813463652cf9b0.tar.gz CMake-0b7822f49aef20ad758c637abe813463652cf9b0.tar.bz2 | |
Merge topic 'win-fallthrough'
21541bb5 Use CM_FALLTHROUGH in Windows-specific code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1555
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f01ed7a..d2c62be 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -615,6 +615,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( switch (target->GetType()) { case cmStateEnums::OBJECT_LIBRARY: targetBuilds = false; // no manifest tool for object library + CM_FALLTHROUGH; case cmStateEnums::STATIC_LIBRARY: projectType = "typeStaticLibrary"; configType = "4"; @@ -630,6 +631,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration( case cmStateEnums::UTILITY: case cmStateEnums::GLOBAL_TARGET: configType = "10"; + CM_FALLTHROUGH; default: targetBuilds = false; break; diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 540d877..d2f21cd 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -52,6 +52,7 @@ static std::string cmVS10EscapeComment(std::string comment) case '>': /* no break */ case '^': echoable += '^'; /* no break */ + CM_FALLTHROUGH; default: echoable += *c; break; |