From ec6587ceb606f28a2101cd3154aa86f2397a43a2 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Fri, 23 Dec 2016 13:25:24 +0300 Subject: [PATCH] CMake: Allow CodeBlocks for NMake Makefiles JOM Change-Id: I280deb2131959cc538c4af4b7e9b9e07b4f41b80 Reviewed-by: Tobias Hunger Reviewed-by: Eike Ziller Reviewed-by: Konstantin Podsvirov --- src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 94047a9c7b6..e290df726dd 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -320,7 +320,8 @@ QVariant CMakeGeneratorKitInformation::defaultValue(const Kit *k) const } else { it = std::find_if(known.constBegin(), known.constEnd(), [extraGenerator](const CMakeTool::Generator &g) { - return g.matches("NMake Makefiles", extraGenerator); + return g.matches("NMake Makefiles", extraGenerator) + || g.matches("NMake Makefiles JOM", extraGenerator); }); } } else {