From 718af236deb7e6f9d8399228e9808a45d285f618 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 25 Sep 2019 18:50:58 +0200
Subject: [PATCH] CMakeProjectManager: Export CMake*Aspect and CMakeConfigItem

Allow other plugins to set CMake specific Kit options.

Change-Id: I038e9fabc3d2cb8cc463adafebecd51b21ef3d05
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakeconfigitem.h     |  4 +++-
 .../cmakeprojectmanager/cmakekitinformation.cpp       |  2 --
 src/plugins/cmakeprojectmanager/cmakekitinformation.h | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
index ae06252c7c7..8b5fce8eb7f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
+++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "cmake_global.h"
+
 #include <utils/optional.h>
 
 #include <QByteArray>
@@ -40,7 +42,7 @@ class MacroExpander;
 
 namespace CMakeProjectManager {
 
-class CMakeConfigItem {
+class CMAKE_EXPORT CMakeConfigItem {
 public:
     enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
     CMakeConfigItem();
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 8c4ee8877d4..9b9561e8be2 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -58,7 +58,6 @@
 using namespace ProjectExplorer;
 
 namespace CMakeProjectManager {
-namespace Internal {
 // --------------------------------------------------------------------
 // CMakeKitAspect:
 // --------------------------------------------------------------------
@@ -1075,5 +1074,4 @@ KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const
     return new CMakeConfigurationKitAspectWidget(k, this);
 }
 
-} // namespace Internal
 } // namespace CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h
index 7920cc1a277..f4901721d6c 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "cmake_global.h"
+
 #include "cmakeconfigitem.h"
 
 #include <projectexplorer/kitmanager.h>
@@ -32,9 +34,7 @@
 namespace CMakeProjectManager {
 class CMakeTool;
 
-namespace Internal {
-
-class CMakeKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -58,7 +58,7 @@ public:
     QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
 };
 
-class CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -88,7 +88,7 @@ private:
     QVariant defaultValue(const ProjectExplorer::Kit *k) const;
 };
 
-class CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -113,5 +113,4 @@ private:
     QVariant defaultValue(const ProjectExplorer::Kit *k) const;
 };
 
-} // namespace Internal
 } // namespace CMakeProjectManager