diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 97557384eb3..d196511a04e 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -33,6 +33,8 @@ #include +#include + #include #include @@ -833,7 +835,8 @@ void CMakeGeneratorKitAspect::addToEnvironment(const Kit *k, Utils::Environment if (info.generator == "NMake Makefiles JOM") { if (env.searchInPath("jom.exe").exists()) return; - env.appendOrSetPath(QCoreApplication::applicationDirPath()); + env.appendOrSetPath(Core::ICore::libexecPath().toUserOutput()); + env.appendOrSetPath(Core::ICore::libexecPath().pathAppended("jom").toUserOutput()); } } diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 8e70a2330c4..9e5b4abc9ec 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -1111,8 +1111,8 @@ FilePath MsvcToolChain::makeCommand(const Environment &environment) const FilePath command; if (useJom) { tmp = environment.searchInPath(jom, - {Utils::FilePath::fromString( - QCoreApplication::applicationDirPath())}); + {Core::ICore::libexecPath(), + Core::ICore::libexecPath().pathAppended("jom")}); if (!tmp.isEmpty()) command = tmp; }