diff --git a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp index b126ded5f7c..cd4f5d49769 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp @@ -76,13 +76,12 @@ static std::vector> autoDetectCMakeTools() path = Utils::filteredUnique(path); if (HostOsInfo::isWindowsHost()) { - const QString progFiles = QLatin1String(qgetenv("ProgramFiles")); - path.append(Utils::FilePath::fromString(progFiles + "/CMake")); - path.append(Utils::FilePath::fromString(progFiles + "/CMake/bin")); - const QString progFilesX86 = QLatin1String(qgetenv("ProgramFiles(x86)")); - if (!progFilesX86.isEmpty()) { - path.append(Utils::FilePath::fromString(progFilesX86 + "/CMake")); - path.append(Utils::FilePath::fromString(progFilesX86 + "/CMake/bin")); + for (auto envVar : {"ProgramFiles", "ProgramFiles(x86)", "ProgramW6432"}) { + if (qEnvironmentVariableIsSet(envVar)) { + const QString progFiles = qEnvironmentVariable(envVar); + path.append(Utils::FilePath::fromString(progFiles + "/CMake")); + path.append(Utils::FilePath::fromString(progFiles + "/CMake/bin")); + } } }