From 645c7f8379e3463f24e268f264f7b6464492a35f Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 21 Jun 2021 08:15:38 +0200 Subject: [PATCH] Docker: Make CMake autodetection a bit more flexible Search in build device path instead of two hardcoded locations. Change-Id: I91e047aa48eb6566353e3ba090070c2a00b3dd06 Reviewed-by: Christian Stenger --- src/plugins/docker/dockerdevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 41231e7e729..31b8ada70ef 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -472,9 +472,9 @@ void DockerDevicePrivate::autoDetectCMake(QTextBrowser *log) log->append('\n' + tr("Searching CMake binary...")); QString error; - const QStringList candidates = {"/usr/local/bin/cmake", "/usr/bin/cmake"}; + const QStringList candidates = {"cmake"}; for (const QString &candidate : candidates) { - const FilePath cmake = q->mapToGlobalPath(FilePath::fromString(candidate)); + const FilePath cmake = q->searchInPath(FilePath::fromString(candidate)); QTC_CHECK(q->hasLocalFileAccess()); if (cmake.isExecutableFile()) { log->append(tr("Found CMake binary: %1").arg(cmake.toUserOutput()));