CMake: Do not set default tool if it doesn't match build device

Follows up on 27baac8a68fec20f9229b1e4773ccb0a27fa52f3

Change-Id: Ibb556908755e7add3deb176eea4cd1627c40dfdb
Reviewed-by: Christian Kandeler <[email protected]>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
index 6a6946b6fae..c2384620963 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitaspect.cpp
@@ -317,9 +317,11 @@ void CMakeKitAspectFactory::setup(Kit *k)
     if (cmakeTool(k))
         return;
 
+    const QList<CMakeTool *> matchingTools = toolsForBuildDevice(k);
     // Look for a suitable auto-detected one:
     const QString kitSource = k->detectionSource().id;
-    for (CMakeTool *tool : toolsForBuildDevice(k)) {
+
+    for (CMakeTool *tool : matchingTools) {
         const QString toolSource = tool->detectionSource().id;
         if (!toolSource.isEmpty() && toolSource == kitSource) {
             CMakeKitAspect::setCMakeExecutable(k, tool->cmakeExecutable());
@@ -327,7 +329,8 @@ void CMakeKitAspectFactory::setup(Kit *k)
         }
     }
 
-    CMakeKitAspect::setCMakeExecutable(k, defaultCMakeExecutable());
+    if (matchingTools.contains(CMakeToolManager::defaultCMakeTool()))
+        CMakeKitAspect::setCMakeExecutable(k, defaultCMakeExecutable());
 }
 
 void CMakeKitAspectFactory::fix(Kit *k)