[Cmake-commits] CMake branch, next, updated. v3.7.1-1910-ga2773b1

[Brad King]

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  a2773b1709e7c853512981039144ed53e3ef802f (commit)
       via  33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (commit)
      from  0e1c33dcb83294825f0f1785895684721f99875b (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=a2773b1709e7c853512981039144ed53e3ef802f
commit a2773b1709e7c853512981039144ed53e3ef802f
Merge: 0e1c33d 33e628e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:33:19 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:33:19 2017 -0500

    Merge topic 'cmake-server-do-not-crash-on-interface-lib' into next
    
    33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
commit 33e628ee809cd1d7ec2a8a0290ac0351fa4d499b
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:31:11 2017 -0500

    server-mode: Do not crash when running into INTERFACE_LIBRARY
    
    Closes: #16539

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index e159c8f..c3bffd6 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -720,12 +720,16 @@ static Json::Value DumpTarget(cmGeneratorTarget* target,
 
   Json::Value result = Json::objectValue;
   result[kNAME_KEY] = target->GetName();
-
   result[kTYPE_KEY] = typeName;
-  result[kFULL_NAME_KEY] = target->GetFullName(config);
   result[kSOURCE_DIRECTORY_KEY] = lg->GetCurrentSourceDirectory();
   result[kBUILD_DIRECTORY_KEY] = lg->GetCurrentBinaryDirectory();
 
+  if (type == cmState::INTERFACE_LIBRARY) {
+    return result;
+  }
+
+  result[kFULL_NAME_KEY] = target->GetFullName(config);
+
   if (target->HaveWellDefinedOutputFiles()) {
     Json::Value artifacts = Json::arrayValue;
     artifacts.append(target->GetFullPath(config, false));

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

Summary of changes:
 Source/cmServerProtocol.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake