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 73b458473d4bf8001037b9605543b03099d0c481 (commit)
via 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (commit)
via c0bd1eb6d0da40d429120e925aa755a1f5a754e8 (commit)
from a2773b1709e7c853512981039144ed53e3ef802f (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=73b458473d4bf8001037b9605543b03099d0c481
commit 73b458473d4bf8001037b9605543b03099d0c481
Merge: a2773b1 0471d13
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 16:41:53 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 9 16:41:53 2017 -0500
Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master' into
next
0471d13e Merge branch 'cmake-server-do-not-crash-on-interface-lib' into
cmake-server-do-not-crash-on-interface-lib-for-master
c0bd1eb6 server-mode: Do not crash when running into INTERFACE_LIBRARY
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
commit 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05
Merge: c0bd1eb 33e628e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 9 16:41:32 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 9 16:41:32 2017 -0500
Merge branch 'cmake-server-do-not-crash-on-interface-lib' into
cmake-server-do-not-crash-on-interface-lib-for-master
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0bd1eb6d0da40d429120e925aa755a1f5a754e8
commit c0bd1eb6d0da40d429120e925aa755a1f5a754e8
Author: Tobias Hunger <tobias.hun...@qt.io>
AuthorDate: Fri Jan 6 15:18:52 2017 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jan 9 16:40:46 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 a86236c..334a05a 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -731,12 +731,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 == cmStateEnums::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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
