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

Vcpkg: Prefer environment variable over executable path

Browse Source 
The executable can be in a different directory.

Change-Id: Ie630d464734d1ef9d0a9e1adfb8da8e56c67b5dd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Marco Bubke
2024-07-27 18:40:55 +02:00
parent 09322f4014
commit ab7225c6d2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcpkg/vcpkgsettings.cpp
View File

@@ -35,10 +35,12 @@ VcpkgSettings::VcpkgSettings()
vcpkgRoot.setSettingsKey("VcpkgRoot"); vcpkgRoot.setSettingsKey("VcpkgRoot");
vcpkgRoot.setExpectedKind(PathChooser::ExistingDirectory); vcpkgRoot.setExpectedKind(PathChooser::ExistingDirectory);
FilePath defaultPath = Environment::systemEnvironment().searchInPath(Constants::VCPKG_COMMAND) FilePath defaultPath = FilePath::fromUserInput(
.parentDir(); qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT));
if (!defaultPath.isDir()) if (!defaultPath.isDir())
defaultPath = FilePath::fromUserInput(qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT)); defaultPath = Environment::systemEnvironment().searchInPath(Constants::VCPKG_COMMAND).parentDir();
if (defaultPath.isDir()) if (defaultPath.isDir())
vcpkgRoot.setDefaultPathValue(defaultPath); vcpkgRoot.setDefaultPathValue(defaultPath);