From bebcf69ce92442652bfa270de20ecef321ec0613 Mon Sep 17 00:00:00 2001 From: Benjamin Zeller Date: Wed, 4 Mar 2015 13:32:31 +0100 Subject: CMakeProjectManager: Provide way for plugins to autodetect cmake tools This patch adds support for plugins to register a callback/lambda to autodetect CMakeTools that would not be found by the default auto- detection function. Without this feature the CMakeToolManager would drop autodetected CMakeTools otherwise on every start. Change-Id: I23b146e5b9acc60018ac87ea4b6cc7573fa0dd30 Reviewed-by: Daniel Teske --- src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp') diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 57f3a77380..9aca653fc6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -73,7 +73,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * addAutoReleasedObject(new CMakeLocatorFilter); new CMakeToolManager(this); - CMakeToolManager::restoreCMakeTools(); ProjectExplorer::KitManager::registerKitInformation(new CMakeKitInformation); @@ -82,4 +81,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * void CMakeProjectPlugin::extensionsInitialized() { + //restore the cmake tools before loading the kits + CMakeToolManager::restoreCMakeTools(); } -- cgit v1.2.1