From 0e3d1064e65a9ba336bf3fdd9ef8f7dc75f6fce4 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 5 Oct 2022 18:35:52 +0200 Subject: [PATCH] CMake: avoid running into some code path that breaks later When trying to configure a CMake project on a remote linux device, there's currently PATH=/some/local/dir/for/ninja added on the ssh command line, which won't work with the remote cmake. Change-Id: I97adb58e4c8b33f74edcc37a7b2cfb00c764b829 Reviewed-by: Cristian Adam --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 784ebe419b2..9afa4b8e21b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -2079,6 +2079,11 @@ FilePath CMakeBuildConfiguration::sourceDirectory() const void CMakeBuildConfiguration::addToEnvironment(Utils::Environment &env) const { + const CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); + // The hack further down is only relevant for desktop + if (tool && tool->cmakeExecutable().needsDevice()) + return; + CMakeSpecificSettings *settings = CMakeProjectPlugin::projectTypeSpecificSettings(); if (!settings->ninjaPath.filePath().isEmpty()) { const Utils::FilePath ninja = settings->ninjaPath.filePath();