diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-10 14:34:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-10 14:34:43 (GMT) |
| commit | 9239141e954c6b9eaba53fcad46fa2de24d8ba44 (patch) | |
| tree | b5fe320cc99aa93e3c9b169f2fca66948a0e36b0 /Source | |
| parent | aff368bb8456694e2550e2f69451456728ab31eb (diff) | |
| parent | 0471d13ecd2ff4d4a0e824a1b1d0d850ea070d05 (diff) | |
| download | CMake-9239141e954c6b9eaba53fcad46fa2de24d8ba44.zip CMake-9239141e954c6b9eaba53fcad46fa2de24d8ba44.tar.gz CMake-9239141e954c6b9eaba53fcad46fa2de24d8ba44.tar.bz2 | |
Merge topic 'cmake-server-do-not-crash-on-interface-lib-for-master'
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
33e628ee server-mode: Do not crash when running into INTERFACE_LIBRARY
Diffstat (limited to 'Source')
| -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 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)); |