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

Meson: Start generalizing again

Browse Source 
Change-Id: I9fc18edb0e159c448193b4cc7c4bd82b2d5f409a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-22 18:10:51 +02:00
parent a4a92a04a1
commit 23b31e24bf
8 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/mesonprojectmanager/toolwrapper.cpp
View File

@@ -102,17 +102,6 @@ Store ToolWrapper::toVariantMap() const
return data;
}
static std::optional<FilePath> findTool(const QStringList &exeNames)
{
Environment systemEnvironment = Environment::systemEnvironment();
for (const auto &exe : exeNames) {
const FilePath exe_path = systemEnvironment.searchInPath(exe);
if (exe_path.exists())
return exe_path;
}
return std::nullopt;
}
template<typename First>
void impl_option_cat(QStringList &list, const First &first)
{
@@ -212,14 +201,25 @@ bool isSetup(const Utils::FilePath &buildPath)
Constants::MESON_INTRO_BUILDSYSTEM_FILES);
}
std::optional<FilePath> findMesonTool()
static std::optional<FilePath> findToolHelper(const QStringList &exeNames)
{
return findTool({"meson.py", "meson"});
Environment systemEnvironment = Environment::systemEnvironment();
for (const auto &exe : exeNames) {
const FilePath exe_path = systemEnvironment.searchInPath(exe);
if (exe_path.exists())
return exe_path;
}
return std::nullopt;
}
std::optional<FilePath> findNinjaTool()
std::optional<FilePath> findTool(ToolType toolType)
{
return findTool({"ninja", "ninja-build"});
if (toolType == ToolType::Meson)
return findToolHelper({"meson.py", "meson"});
if (toolType == ToolType::Ninja)
return findToolHelper({"ninja", "ninja-build"});
QTC_CHECK(false);
return {};
}
} // namespace Internal