diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-11-27 13:40:55 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-11-28 07:42:09 +0000 |
| commit | dcd8238cb777c406366341148adb63fe34e717e9 (patch) | |
| tree | 3f84fdf86010d4102e2572c7e13776da2c0c264b | |
| parent | e3dbabaa64f70f842bdd7c59b5463541b3a4a0b3 (diff) | |
Don't set platform/toolset on any Ninja generator
We didn't set platform/toolset on the Ninja Multi-Config generator. Do
that also for the single-config Ninja generator.
Change-Id: I55cc0abd059b0137599d58272201e539e74041dc
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
| -rw-r--r-- | qt-cpp/src/kit-manager.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts index bac8fd6..522e713 100644 --- a/qt-cpp/src/kit-manager.ts +++ b/qt-cpp/src/kit-manager.ts @@ -765,7 +765,7 @@ export class KitManager { ); if (kit.preferredGenerator) { kit.preferredGenerator.name = newKit.preferredGenerator.name; - if (kit.preferredGenerator.name == CMakeDefaultGenerator) { + if (kit.preferredGenerator.name.startsWith("Ninja")) { if (newKit.cmakeSettings) { if (kit.cmakeSettings == undefined) { kit.cmakeSettings = {}; @@ -775,7 +775,7 @@ export class KitManager { ...kit.cmakeSettings }; } - // Generator 'Ninja Multi-Config' does not support platform & toolset specification + // Ninja generators do not support platform & toolset specification. kit.preferredGenerator.platform = undefined; kit.preferredGenerator.toolset = undefined; } |
