From a615b236e5b20f19d2d46979550b9d16fa6716ba Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 29 Jan 2024 14:45:04 +0100
Subject: [PATCH] CMake: Use a setup function for
 CMakeBuildConfigurationFactory

The class itself is still used by IosCMakeBuildConfigurationFactory.

Change-Id: I9fd979fc8e24c9f032b35c1f3444c28d06f86d0a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 ++++++
 src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h   | 2 ++
 src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp      | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index c879c0a0424..c1d5c5913ba 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -2254,5 +2254,11 @@ void ConfigureEnvironmentAspect::toMap(Store &map) const
     map.insert(USER_ENVIRONMENT_CHANGES_KEY, tmpMap.value(CHANGES_KEY).toStringList());
 }
 
+
+void setupCMakeBuildConfiguration()
+{
+    static CMakeBuildConfigurationFactory theCMakeBuildConfigurationFactory;
+}
+
 } // namespace Internal
 } // namespace CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 765c960bd1a..c2ac9dfd48f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -131,4 +131,6 @@ private:
     friend class Internal::CMakeProjectImporter;
 };
 
+namespace Internal { void setupCMakeBuildConfiguration(); }
+
 } // namespace CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 305f8860829..9ba8bb87e74 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -52,7 +52,6 @@ public:
         Action::AlwaysEnabled/*handled manually*/
     };
 
-    CMakeBuildConfigurationFactory buildConfigFactory;
     CMakeInstallStepFactory installStepFactory;
     CMakeBuildTargetFilter cMakeBuildTargetFilter;
     CMakeOpenTargetFilter cMakeOpenTargetFilter;
@@ -75,6 +74,8 @@ class CMakeProjectPlugin final : public ExtensionSystem::IPlugin
         setupCMakeToolManager(this);
 
         setupCMakeSettingsPage();
+
+        setupCMakeBuildConfiguration();
         setupCMakeBuildStep();
 
         setupCMakeEditor();