summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2022-09-01 08:52:12 +0200
committerMarcus Tillmanns <marcus.tillmanns@qt.io>2022-09-06 06:04:47 +0000
commitef11da362989c53a9e902436c1c66ec0b640f844 (patch)
tree315361f25141f20c27c9173707c1bc0e2c371412
parent1567d2498034a492fa72b1fd660b41f46d165408 (diff)
downloadqt-creator-ef11da362989c53a9e902436c1c66ec0b640f844.tar.gz
Fix: Initial CMake run does not have PATH set
If certain tools are not in the systems base PATH, as can be the case on macOS where Ninja might be located in /usr/local/bin, the initial run of cmake for a new/clean project would fail as the PATH (and the rest of the environment variables) would not be set for a freshly initialized CMakeBuildConfiguration. This change fixes that by calling updateAndEmitConfigureEnvironmentChanged at the end of the build system initialization. Change-Id: Ib2ebe4da60a6284548eabed124240212178c67e1 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 6590594d4e..a581833b7a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1367,6 +1367,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
m_buildSystem->setInitialCMakeArguments(cmd.splitArguments());
m_buildSystem->setCMakeBuildType(buildType);
+ updateAndEmitConfigureEnvironmentChanged();
});
}