Fix cmaker API and test

specs-feup · Aug 7, 2024 · dddbe30 · dddbe30
1 parent b8c2130
commit dddbe30
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 25 deletions.
diff --git a/Clava-JS/src-api/clava/cmake/CMaker.ts b/Clava-JS/src-api/clava/cmake/CMaker.ts
@@ -286,33 +286,26 @@ export default class CMaker extends BenchmarkCompilationEngine {
     const builderFolderpath = Io.mkdir(builderFolder).getAbsolutePath();
 
     // Execute CMake
-    let cmakeCmd =
-      'cmake "' + cmakeFile.getParentFile().getAbsolutePath() + '"';
+    let cmakeCmd = ["cmake", `"${cmakeFile.getParentFile().getAbsolutePath()}"`];
     if (cmakeFlags !== undefined) {
-      cmakeCmd += " " + cmakeFlags;
+      cmakeCmd.push(cmakeFlags);
     }
 
     if (this.generator !== undefined) {
-      cmakeCmd += ` -G "${this.generator}"`;
+      cmakeCmd.push(`-G "${this.generator}"`);
     }
 
     if (this.compiler !== undefined) {
-      cmakeCmd += " " + this.compiler.getCommandArgs();
+      cmakeCmd.push(this.compiler.getCommandArgs());
     }
 
-    debug(
-      "Executing CMake, calling '" +
-        cmakeCmd +
-        "' at ' " +
-        builderFolderpath +
-        " '"
-    );
+    debug(() =>`Executing CMake, calling '${cmakeCmd.join(" ")}' at '${builderFolderpath}'`);
     const cmakeOutput = new ProcessExecutor();
 
     cmakeOutput
       .setPrintToConsole(this.printToConsole)
       .setWorkingDir(builderFolderpath)
-      .execute(cmakeCmd);
+      .execute(...cmakeCmd);
 
     const consoleOutput = cmakeOutput.getConsoleOutput();
     if (cmakeOutput.getReturnValue() === 0 && consoleOutput != undefined) {

diff --git a/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js b/ClavaLaraApi/src-lara/clava/clava/cmake/CMaker.js
diff --git a/ClavaWeaver/resources/clava/test/api/CMakerTest.js b/ClavaWeaver/resources/clava/test/api/CMakerTest.js
@@ -3,7 +3,7 @@ laraImport("lara.Platforms");
 laraImport("clava.cmake.CMaker");
 laraImport("clava.Clava");
 
-var cmaker = new CMaker("testapp")
+const cmaker = new CMaker("testapp")
   .setMinimumVersion("3.0.2")
   .addCxxFlags("-O3", "-std=c++11")
   .addLibs("stdc++")
@@ -14,7 +14,7 @@ if (Platforms.isWindows()) {
 }
 
 // Build
-var executable = cmaker.build();
+const executable = cmaker.build();
 
 if (executable !== undefined) {
   println("Created executable: " + Io.removeExtension(executable.getName()));