diff options
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 88f4b7726fb..4a998fb468a 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -33,10 +33,12 @@ #include <app/app_version.h> #include <coreplugin/icore.h> #include <coreplugin/variablechooser.h> -#include <projectexplorer/task.h> -#include <projectexplorer/toolchain.h> #include <projectexplorer/kit.h> #include <projectexplorer/kitinformation.h> +#include <projectexplorer/projectexplorer.h> +#include <projectexplorer/projectexplorersettings.h> +#include <projectexplorer/task.h> +#include <projectexplorer/toolchain.h> #include <qtsupport/baseqtversion.h> #include <qtsupport/qtkitinformation.h> #include <projectexplorer/projectexplorerconstants.h> @@ -643,6 +645,21 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const return g.matches("NMake Makefiles", extraGenerator) || g.matches("NMake Makefiles JOM", extraGenerator); }); + if (ProjectExplorerPlugin::projectExplorerSettings().useJom) { + it = std::find_if(known.constBegin(), + known.constEnd(), + [extraGenerator](const CMakeTool::Generator &g) { + return g.matches("NMake Makefiles JOM", extraGenerator); + }); + } + + if (it == known.constEnd()) { + it = std::find_if(known.constBegin(), + known.constEnd(), + [extraGenerator](const CMakeTool::Generator &g) { + return g.matches("NMake Makefiles", extraGenerator); + }); + } } } else { // Unix-oid OSes: |