From c9be75fe65c0e83b80a01730c841818f3c51f144 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Wed, 30 Nov 2016 14:12:56 +0100
Subject: [PATCH] CMake: Handle executables properly in server-mode
Change-Id: Idabfc2449377d0d81cc1639ad4992d8710ec8b7d
Task-number: QTCREATORBUG-17359
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
src/plugins/cmakeprojectmanager/servermodereader.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index eea7938ccf..60770fb1a1 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -191,7 +191,9 @@ QList<CMakeBuildTarget> ServerModeReader::buildTargets() const
ct.title = t->name;
ct.executable = t->artifacts.isEmpty() ? FileName() : t->artifacts.at(0);
TargetType type = UtilityType;
- if (t->type == "STATIC_LIBRARY")
+ if (t->type == "EXECUTABLE")
+ type = ExecutableType;
+ else if (t->type == "STATIC_LIBRARY")
type = StaticLibraryType;
else if (t->type == "MODULE_LIBRARY"
|| t->type == "SHARED_LIBRARY"
--
GitLab