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

CMakePM: Better error message for no CMake present case

Browse Source 
Currently if no CMake has been registered and a CMake project has been
openend the user will get the error:
"CMake version  is unsupported. Update to version 3.14 (with file-api)
or later."

With this patch the user will get the error:
"The kit needs to define a CMake tool to parse this project."

Change-Id: I555884fff1eac321052998d1ef7970a49b2f44af
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Cristian Adam
2022-06-28 16:08:09 +02:00
parent bbf16bba37
commit 175a61ad1b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -377,16 +377,17 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
return; // ignore request, this build configuration is not active! return; // ignore request, this build configuration is not active!
} }
if (!parameters.cmakeTool()) { const CMakeTool *tool = parameters.cmakeTool();
if (!tool || !tool->isValid()) {
TaskHub::addTask( TaskHub::addTask(
BuildSystemTask(Task::Error, BuildSystemTask(Task::Error,
tr("The kit needs to define a CMake tool to parse this project."))); tr("The kit needs to define a CMake tool to parse this project.")));
return; return;
} }
if (!parameters.cmakeTool()->hasFileApi()) { if (!tool->hasFileApi()) {
TaskHub::addTask(BuildSystemTask(Task::Error, TaskHub::addTask(
CMakeKitAspect::msgUnsupportedVersion( BuildSystemTask(Task::Error,
parameters.cmakeTool()->version().fullVersion))); CMakeKitAspect::msgUnsupportedVersion(tool->version().fullVersion)));
return; return;
} }
QTC_ASSERT(parameters.isValid(), return ); QTC_ASSERT(parameters.isValid(), return );

2
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -261,7 +261,7 @@ Tasks CMakeKitAspect::validate(const Kit *k) const
{ {
Tasks result; Tasks result;
CMakeTool *tool = CMakeKitAspect::cmakeTool(k); CMakeTool *tool = CMakeKitAspect::cmakeTool(k);
if (tool) { if (tool && tool->isValid()) {
CMakeTool::Version version = tool->version(); CMakeTool::Version version = tool->version();
if (version.major < 3 || (version.major == 3 && version.minor < 14)) { if (version.major < 3 || (version.major == 3 && version.minor < 14)) {
result << BuildSystemTask(Task::Warning, msgUnsupportedVersion(version.fullVersion)); result << BuildSystemTask(Task::Warning, msgUnsupportedVersion(version.fullVersion));