From 3968bcb7b59e522f328496cc56b427fde75c79d2 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 27 Nov 2024 13:36:39 +0100
Subject: Make Ninja the default CMake generator

Many projects are not prepared for multi-config generators. Use the
single-config Ninja generator as default to avoid nasty surprises.

This also enables us to remove code where we set the preferred generator
to Ninja for certain target platforms.

Fixes: VSCODEEXT-108
Change-Id: I969b4b40752530efff2aa564402f9079f5647dc8
Reviewed-by: Orkun Tokdemir <orkun.tokdemir@qt.io>
---
 qt-cpp/src/kit-manager.ts | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts
index 522e713..780a3ad 100644
--- a/qt-cpp/src/kit-manager.ts
+++ b/qt-cpp/src/kit-manager.ts
@@ -32,7 +32,7 @@ import { EXTENSION_ID } from '@/constants';
 
 const logger = createLogger('kit-manager');
 
-export const CMakeDefaultGenerator = 'Ninja Multi-Config';
+export const CMakeDefaultGenerator = 'Ninja';
 const CMakeToolsDir = path.join(UserLocalDir, 'CMakeTools');
 export const CMAKE_GLOBAL_KITS_FILEPATH = path.join(
   CMakeToolsDir,
@@ -313,15 +313,8 @@ export class KitManager {
     };
     const version = qtInfo.get('QT_VERSION');
     kit.name = qtInfo.name ? qtInfo.name : generateDefaultQtPathsName(qtInfo);
-
-    const preferredGenerator = qtInfo
-      .get('QMAKE_XSPEC')
-      ?.toLowerCase()
-      .includes('wasm-emscripten')
-      ? 'Ninja'
-      : CMakeDefaultGenerator;
     kit.preferredGenerator = {
-      name: preferredGenerator
+      name: CMakeDefaultGenerator
     };
     const libs = qtInfo.get('QT_INSTALL_LIBS');
     if (!libs) {
@@ -527,9 +520,6 @@ export class KitManager {
       }
     }
     const kitName = qtPath.mangleQtInstallation(qtInsRoot, installation);
-    const kitPreferredGenerator = kitName.toLowerCase().includes('wasm_')
-      ? 'Ninja'
-      : CMakeDefaultGenerator;
     let newKit: Kit = {
       name: kitName,
       environmentVariables: {
@@ -538,7 +528,7 @@ export class KitManager {
       },
       isTrusted: true,
       preferredGenerator: {
-        name: kitPreferredGenerator
+        name: CMakeDefaultGenerator
       },
       cmakeSettings: {
         QT_QML_GENERATE_QMLLS_INI: 'ON'
-- 
cgit v1.2.3