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

CMake: Use new FilePath::searchAllInDirectories function

Browse Source 
Change-Id: Idd696603548d7504ff87152e9125667dca4c42ab
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2023-05-23 09:22:15 +02:00
parent 3ecaabf5e9
commit 79dd2a8c8b
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -45,36 +45,26 @@ const char CMAKE_TOOL_FILENAME[] = "cmaketools.xml";
static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools() static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
{ {
Environment env = Environment::systemEnvironment(); FilePaths extraDirs;
FilePaths path = env.path();
path = Utils::filteredUnique(path);
if (HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
for (const auto &envVar : QStringList{"ProgramFiles", "ProgramFiles(x86)", "ProgramW6432"}) { for (const auto &envVar : QStringList{"ProgramFiles", "ProgramFiles(x86)", "ProgramW6432"}) {
if (qtcEnvironmentVariableIsSet(envVar)) { if (qtcEnvironmentVariableIsSet(envVar)) {
const QString progFiles = qtcEnvironmentVariable(envVar); const QString progFiles = qtcEnvironmentVariable(envVar);
path.append(FilePath::fromUserInput(progFiles + "/CMake")); extraDirs.append(FilePath::fromUserInput(progFiles + "/CMake"));
path.append(FilePath::fromUserInput(progFiles + "/CMake/bin")); extraDirs.append(FilePath::fromUserInput(progFiles + "/CMake/bin"));
} }
} }
} }
if (HostOsInfo::isMacHost()) { if (HostOsInfo::isMacHost()) {
path.append("/Applications/CMake.app/Contents/bin"); extraDirs.append("/Applications/CMake.app/Contents/bin");
path.append("/usr/local/bin"); // homebrew intel extraDirs.append("/usr/local/bin"); // homebrew intel
path.append("/opt/homebrew/bin"); // homebrew arm extraDirs.append("/opt/homebrew/bin"); // homebrew arm
path.append("/opt/local/bin"); // macports extraDirs.append("/opt/local/bin"); // macports
} }
FilePaths suspects; const FilePaths suspects = FilePath("cmake").searchAllInPath(extraDirs);
for (const FilePath &base : std::as_const(path)) {
if (base.isEmpty())
continue;
const FilePath suspect = base / "cmake";
if (std::optional<FilePath> foundExe = suspect.refersToExecutableFile(FilePath::WithAnySuffix))
suspects << *foundExe;
}
std::vector<std::unique_ptr<CMakeTool>> found; std::vector<std::unique_ptr<CMakeTool>> found;
for (const FilePath &command : std::as_const(suspects)) { for (const FilePath &command : std::as_const(suspects)) {