[Cmake-commits] CMake branch, master, updated. v3.14.1-546-gc5eb01d

[Kitware Robot]

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, master has been updated
       via  c5eb01d4d412610673c85ca1bf8b9d15c168ab5e (commit)
       via  99698ee351a6ec05ec1436299818e759a58bc0a3 (commit)
      from  5ad73b608d4fc7cc6b30017159b800802a503b0c (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=c5eb01d4d412610673c85ca1bf8b9d15c168ab5e
commit c5eb01d4d412610673c85ca1bf8b9d15c168ab5e
Merge: 5ad73b6 99698ee
Author:     Craig Scott <craig.scott at crascit.com>
AuthorDate: Mon Apr 1 12:57:02 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 1 08:57:13 2019 -0400

    Merge topic 'bug/missed-return-on-cli-errors'
    
    99698ee351 cmake: Fix missed `return` statement when CLI errors found
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3171


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99698ee351a6ec05ec1436299818e759a58bc0a3
commit 99698ee351a6ec05ec1436299818e759a58bc0a3
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Sun Mar 31 23:35:56 2019 +0800
Commit:     Craig Scott <craig.scott at crascit.com>
CommitDate: Mon Apr 1 08:31:25 2019 +1100

    cmake: Fix missed `return` statement when CLI errors found

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8c1a359..fc24ac0 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -710,6 +710,7 @@ void cmake::SetArgs(const std::vector<std::string>& args)
       this->GraphVizFile = path;
       if (this->GraphVizFile.empty()) {
         cmSystemTools::Error("No file specified for --graphviz");
+        return;
       }
     } else if (arg.find("--debug-trycompile", 0) == 0) {
       std::cout << "debug trycompile on\n";
@@ -797,9 +798,9 @@ void cmake::SetArgs(const std::vector<std::string>& args)
         cmSystemTools::Error("Could not create named generator " + value +
                              kdevError);
         this->PrintGeneratorList();
-      } else {
-        this->SetGlobalGenerator(gen);
+        return;
       }
+      this->SetGlobalGenerator(gen);
     }
     // no option assume it is the path to the source or an existing build
     else {

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

Summary of changes:
 Source/cmake.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake