Skip to content

Commit 45fa57f

Browse files
authored
User defined generator has priority over any other selection criteria (#906)
1 parent f524926 commit 45fa57f

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/drivers/driver.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,17 @@ export abstract class CMakeDriver implements vscode.Disposable {
320320
if (kit.preferredGenerator)
321321
preferredGenerators.push(kit.preferredGenerator);
322322

323-
this._generator = await this.findBestGenerator(preferredGenerators);
323+
// Use the "best generator" selection logic only if the user did not define already
324+
// in settings (via "cmake.generator") a particular generator to be used.
325+
if (this.config.generator) {
326+
this._generator = {
327+
name: this.config.generator,
328+
platform: this.config.platform || undefined,
329+
toolset: this.config.toolset || undefined,
330+
};
331+
} else {
332+
this._generator = await this.findBestGenerator(preferredGenerators);
333+
}
324334
}
325335

326336
protected abstract doSetKit(needsClean: boolean, cb: () => Promise<void>): Promise<void>;

0 commit comments

Comments
 (0)