commit eef87a37cdfe6493dd292e1278771a8c6c819242
author Brad King <brad.king@kitware.com> Thu Dec 13 15:01:27 2018 +0000
committer Kitware Robot <kwrobot@kitware.com> Thu Dec 13 10:01:34 2018 -0500
tree 42db79d642a68dfa99ed65c80bad644390761031
parent 04a9145af5a16ea1329e63b7708886744f50a981
parent c150bf087c9ba3425d91bb1103589a928fc87098

Merge topic 'server-mode-install-fix'

c150bf087c Server mode: Fix regression of hasInstallRule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2735

Source/cmJsonObjects.cxx

diff --git a/Source/cmJsonObjects.cxx b/Source/cmJsonObjects.cxx
index bc50f9f..0da6f4f 100644
--- a/Source/cmJsonObjects.cxx
+++ b/Source/cmJsonObjects.cxx
@@ -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 @@
     // 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;