diff options
| author | David Schulz <david.schulz@qt.io> | 2020-04-17 08:53:16 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2020-04-23 12:59:43 +0000 |
| commit | 2aac4cc07f5c794a8b0e97709925a6d3169866b3 (patch) | |
| tree | 8522cff61608fd461c7510c5720e8d226aadd09b /src/plugins/cmakeprojectmanager | |
| parent | 169c3bb30c84ce804a5921751629ee96cae4917d (diff) | |
CMake: honor use jom instead of nmake setting
Only search for the jom cmake generator if this setting is
enabled.
Change-Id: Id8eed91d47f1f6ca2375fe0d169b21168c5ca4ff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
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 88f4b7726f..4a998fb468 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: |