feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Simple Auto-detection for cmake binaries

Browse Source 
Change-Id: Ia7e6f648c99c87786604cb8801c1408b9e231d3d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-17 13:49:43 +02:00
parent df4b682474
commit 8ffeecc633
4 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/docker/dockerdevice.cpp
View File

@@ -27,6 +27,8 @@
#include "dockerconstants.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -373,6 +375,27 @@ void DockerDevice::autoDetectToolChains()
}
}
void DockerDevice::autoDetectCMake()
{
QObject *cmakeManager = ExtensionSystem::PluginManager::getObjectByName("CMakeToolManager");
if (!cmakeManager)
return;
QString error;
QString source = "docker:" + d->m_data.imageId;
const QStringList candidates = {"/usr/local/bin/cmake", "/usr/bin/cmake"};
for (const QString &candidate : candidates) {
const FilePath cmake = mapToGlobalPath(FilePath::fromString(candidate));
QTC_CHECK(hasLocalFileAccess());
if (cmake.isExecutableFile()) {
const bool res = QMetaObject::invokeMethod(cmakeManager,
"registerCMakeByPath",
Q_ARG(Utils::FilePath, cmake));
QTC_CHECK(res);
}
}
}
void DockerDevice::tryCreateLocalFileAccess() const
{
if (!d->m_container.isEmpty())
@@ -798,8 +821,11 @@ public:
device->setupId(IDevice::ManuallyAdded, Utils::Id());
device->setType(Constants::DOCKER_DEVICE_TYPE);
device->setMachineType(IDevice::Hardware);
device->tryCreateLocalFileAccess();
device->autoDetectToolChains();
device->autoDetectQtVersion();
device->autoDetectCMake();
return device;
}