diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-09 21:33:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-01-09 21:33:02 (GMT) |
| commit | 68d13665e023f6ccb51ba0375cabd27e492db483 (patch) | |
| tree | 00574127ff792272375eab5f5120d5102e6cb789 | |
| parent | 195ab50f635bb95035b5bf2fda7a3bf692a122f5 (diff) | |
| parent | 33e628ee809cd1d7ec2a8a0290ac0351fa4d499b (diff) | |
| download | CMake-68d13665e023f6ccb51ba0375cabd27e492db483.zip CMake-68d13665e023f6ccb51ba0375cabd27e492db483.tar.gz CMake-68d13665e023f6ccb51ba0375cabd27e492db483.tar.bz2 | |
Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release
| -rw-r--r-- | Source/cmServerProtocol.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 7815491..895337f 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)); |