From a1f1541a4ab00ab33335e8915346ba3b57321e76 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 10 Jul 2023 10:37:38 -0400 Subject: [PATCH] fix precedence order of cmake.parallelJobs setting --- src/drivers/cmakeDriver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/cmakeDriver.ts b/src/drivers/cmakeDriver.ts index cc99eac20b..d61903f30d 100644 --- a/src/drivers/cmakeDriver.ts +++ b/src/drivers/cmakeDriver.ts @@ -1713,7 +1713,7 @@ export abstract class CMakeDriver implements vscode.Disposable { const configurationScope = this.workspaceFolder ? vscode.Uri.file(this.workspaceFolder) : null; const parallelJobsSetting = vscode.workspace.getConfiguration("cmake", configurationScope).inspect('parallelJobs'); - let numJobs: number | undefined = (parallelJobsSetting?.globalValue || parallelJobsSetting?.workspaceValue || parallelJobsSetting?.workspaceFolderValue); + let numJobs: number | undefined = (parallelJobsSetting?.workspaceFolderLanguageValue || parallelJobsSetting?.workspaceFolderValue || parallelJobsSetting?.globalValue); // for Ninja generator, don't '-j' argument if user didn't define number of jobs // let numJobs: number | undefined = this.config.numJobs; if (numJobs === undefined && gen && !/Ninja/.test(gen)) {