From 0026d3dc3d4031bc423103de6cbc137b4ddc7468 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Wed, 19 Jun 2019 13:25:27 +0200
Subject: [PATCH] CMake: Keep more accurate information on build types

Do not map anything vaguely library-related into DynamicLibraryType. This
will prevent creator from e.g. trying to deploy ObjectLibraries.

Change-Id: I34a0d981d2a949f587e1804268cc66231aedd545
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildtarget.h   | 9 +++++----
 src/plugins/cmakeprojectmanager/servermodereader.cpp | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
index e46394bef56..d64bd2b9edd 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h
@@ -36,10 +36,11 @@
 namespace CMakeProjectManager {
 
 enum TargetType {
-    ExecutableType = 0,
-    StaticLibraryType = 2,
-    DynamicLibraryType = 3,
-    UtilityType = 64
+    ExecutableType,
+    StaticLibraryType,
+    DynamicLibraryType,
+    ObjectLibraryType,
+    UtilityType
 };
 
 class CMAKE_EXPORT CMakeBuildTarget
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index f5a96dc77f2..7dd06ef0eab 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -201,10 +201,10 @@ QList<CMakeBuildTarget> ServerModeReader::takeBuildTargets(QString &errorMessage
             type = ExecutableType;
         else if (t->type == "STATIC_LIBRARY")
             type = StaticLibraryType;
-        else if (t->type == "MODULE_LIBRARY"
-                 || t->type == "SHARED_LIBRARY"
-                 || t->type == "INTERFACE_LIBRARY"
-                 || t->type == "OBJECT_LIBRARY")
+        else if (t->type == "OBJECT_LIBRARY")
+            type = ObjectLibraryType;
+        else if (t->type == "MODULE_LIBRARY" || t->type == "SHARED_LIBRARY"
+                 || t->type == "INTERFACE_LIBRARY")
             type = DynamicLibraryType;
         else
             type = UtilityType;