forked from qt-creator/qt-creator
CMake: Fix missing path to Ninja from Qt installers
In the configure environment for MSVC toolchains. The MSVC toolchain actually overwrites the PATH environment (triggered via kit()->addToBuildEnvironment(result)), which it shouldn't. But this is a minimal fix for Qt Creator 9.0 that also is in line with what BuildConfiguration::baseEnvironment() does. Fixes: QTCREATORBUG-28685 Change-Id: I0cb8e3c84419403672175bd581c16d90902e23ba Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -2168,8 +2168,8 @@ Environment CMakeBuildConfiguration::baseConfigureEnvironment() const
|
||||
ProjectExplorer::IDevice::ConstPtr devicePtr = BuildDeviceKitAspect::device(kit());
|
||||
result = devicePtr ? devicePtr->systemEnvironment() : Environment::systemEnvironment();
|
||||
}
|
||||
addToEnvironment(result);
|
||||
kit()->addToBuildEnvironment(result);
|
||||
addToEnvironment(result);
|
||||
result.modify(project()->additionalEnvironment());
|
||||
return result;
|
||||
}
|
||||
|
Reference in New Issue
Block a user