diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 4a998fb468a..0e0d47cb5f0 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -787,6 +787,16 @@ KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const return new CMakeGeneratorKitAspectWidget(k, this); } +void CMakeGeneratorKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const +{ + GeneratorInfo info = generatorInfo(k); + if (info.generator == "NMake Makefiles JOM") { + if (env.searchInPath("jom.exe").exists()) + return; + env.appendOrSetPath(QCoreApplication::applicationDirPath()); + } +} + // -------------------------------------------------------------------- // CMakeConfigurationKitAspect: // -------------------------------------------------------------------- diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index f4901721d6c..f2579f3282c 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -83,6 +83,7 @@ public: void upgrade(ProjectExplorer::Kit *k) final; ItemList toUserOutput(const ProjectExplorer::Kit *k) const final; ProjectExplorer::KitAspectWidget *createConfigWidget(ProjectExplorer::Kit *k) const final; + void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const final; private: QVariant defaultValue(const ProjectExplorer::Kit *k) const;