From 0add9d353f07490a650ac1396af04a6d3edb9ef9 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Mon, 12 Apr 2021 01:48:56 +0800
Subject: [PATCH] If we have both "-DCMAKE_GENERATOR:STRING=" and the generator
 from toolchain, prefre using "-DCMAKE_GENERATOR:STRING=", as
 "-DCMAKE_GENERATOR:STRING=" can be defined by different cmake-variants.yaml

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 src/drivers/cmfileapi-driver.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/drivers/cmfileapi-driver.ts b/src/drivers/cmfileapi-driver.ts
index e862a1968..9420a9262 100644
--- a/src/drivers/cmfileapi-driver.ts
+++ b/src/drivers/cmfileapi-driver.ts
@@ -178,7 +178,13 @@ export class CMakeFileApiDriver extends codemodel.CodeModelDriver {
     const bindir = util.lightNormalizePath(this.binaryDir);
     args.push(`-B${bindir}`);
     const gen = this.generator;
-    if (gen) {
+    let has_gen = false;
+    for (const arg of args) {
+      if (arg.startsWith("-DCMAKE_GENERATOR:STRING=")) {
+        has_gen = true;
+      }
+    }
+    if (!has_gen && gen) {
       args.push('-G');
       args.push(gen.name);
       if (gen.toolset) {