mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 19:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'server-mode-install-fix'

Browse Source 
c150bf087c Server mode: Fix regression of hasInstallRule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2735
This commit is contained in:
Brad King
2018-12-13 15:01:27 +00:00
committed by Kitware Robot
parent 04a9145af5 c150bf087c
commit eef87a37cd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmJsonObjects.cxx
View File

@@ -6,6 +6,7 @@
#include "cmGeneratorTarget.h"
#include "cmGlobalGenerator.h"
#include "cmInstallGenerator.h"
#include "cmInstallSubdirectoryGenerator.h"
#include "cmInstallTargetGenerator.h"
#include "cmJsonObjectDictionary.h"
#include "cmJsonObjects.h"
@@ -640,8 +641,13 @@ static Json::Value DumpProjectList(const cmake* cm, std::string const& config)
// associated generators.
bool hasInstallRule = false;
for (const auto generator : projectIt.second) {
hasInstallRule =
generator->GetMakefile()->GetInstallGenerators().empty() == false;
for (const auto installGen :
generator->GetMakefile()->GetInstallGenerators()) {
if (!dynamic_cast<cmInstallSubdirectoryGenerator*>(installGen)) {
hasInstallRule = true;
break;
}
}
if (hasInstallRule) {
break;