[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-674-gec25bfb

[Daniel Pfeifer]

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  ec25bfbe1a2623245fb3b7bc047b5243d3916dfd (commit)
       via  d2080ff950d88d91f80affce596171862c0fcd59 (commit)
      from  307cb3c1f24857f4ff93747c14fb268d6b20fdb4 (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=ec25bfbe1a2623245fb3b7bc047b5243d3916dfd
commit ec25bfbe1a2623245fb3b7bc047b5243d3916dfd
Merge: 307cb3c d2080ff
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Oct 19 15:06:55 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 19 15:06:55 2016 -0400

    Merge topic 'clang-tidy' into next
    
    d2080ff9 fixup! fix more issues reported by clang-tidy


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2080ff950d88d91f80affce596171862c0fcd59
commit d2080ff950d88d91f80affce596171862c0fcd59
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Oct 19 21:06:13 2016 +0200
Commit:     Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Oct 19 21:06:13 2016 +0200

    fixup! fix more issues reported by clang-tidy

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 073d0d6..de48193 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -934,13 +934,15 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
     e << "NAME property is read-only\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
-  } else if (prop == "EXPORT_NAME" && this->IsImported()) {
+  }
+  if (prop == "EXPORT_NAME" && this->IsImported()) {
     std::ostringstream e;
     e << "EXPORT_NAME property can't be set on imported targets (\""
       << this->Name << "\")\n";
     this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
     return;
-  } else if (prop == "SOURCES" && this->IsImported()) {
+  }
+  if (prop == "SOURCES" && this->IsImported()) {
     std::ostringstream e;
     e << "SOURCES property can't be set on imported targets (\"" << this->Name
       << "\")\n";
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 290261a..b878534 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -803,9 +803,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       }
       std::cerr << std::endl;
       return 1;
-    } else if (args[1] == "vs_link_exe") {
+    }
+
+    if (args[1] == "vs_link_exe") {
       return cmcmd::VisualStudioLink(args, 1);
-    } else if (args[1] == "vs_link_dll") {
+    }
+
+    if (args[1] == "vs_link_dll") {
       return cmcmd::VisualStudioLink(args, 2);
     }
 
@@ -928,7 +932,9 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
 #endif
       }
       return 0;
-    } else if (args[1] == "server") {
+    }
+
+    if (args[1] == "server") {
       const std::string pipePrefix = "--pipe=";
       bool supportExperimental = false;
       bool isDebug = false;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |    6 ++++--
 Source/cmcmd.cxx    |   12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake