Don't fail if CMakeLists.txt was appended to sourceDirectory (microso…

…ft#1016)
adslqa · Jan 23, 2020 · 4006a88 · 4006a88
1 parent b1fe911
commit 4006a88
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/drivers/driver.ts b/src/drivers/driver.ts
@@ -394,6 +394,10 @@ export abstract class CMakeDriver implements vscode.Disposable {
       log.debug('Run _refreshExpansions cb');
       const opts = this.expansionOptions;
       this._sourceDirectory = util.lightNormalizePath(await expand.expandString(this.config.sourceDirectory, opts));
+      if (path.basename(this._sourceDirectory).toLocaleLowerCase() === "cmakelists.txt") {
+        // Don't fail if CMakeLists.txt was accidentally appended to the sourceDirectory.
+        this._sourceDirectory = path.dirname(this._sourceDirectory);
+      }
       this._binaryDir = util.lightNormalizePath(await expand.expandString(this.config.buildDirectory, opts));
 
       const installPrefix = this.config.installPrefix;