kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cmake-server-do-not-crash-on-interface-lib' into release

This commit is contained in:
Brad King 2017-01-09 16:33:02 -05:00
parent 195ab50f63 33e628ee80
commit 68d13665e0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmServerProtocol.cxx
View File

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