Add build args after -- in argv

Fix typo (?)

Parse build args properly (hopefully)

Fix calling cmake with custom build args

bin/cmake-js

@@ -26,8 +26,20 @@ for (var key of _.keys(npmConfigData)) {
 
 console.log(process.argv);
 
+// forwards everything after '--' in argv as arguments to the build command
+var buildArgs = [];
+var hasSeenDoubleDash = false;
+process.argv.forEach(function (arg) {
+    if (!hasSeenDoubleDash) {
+        hasSeenDoubleDash = arg === '--';
+        return;
+    }
+
+  buildArgs.push(arg);
+});
+
 var yargs = require("yargs")
-    .usage("CMake.js " + version + "\n\nUsage: $0 [<command>] [options]")
+    .usage("CMake.js " + version + "\n\nUsage: $0 [<command>] [options] [-- <build args>]")
     .version(function () {
         return version;
     })
@@ -211,6 +223,7 @@ var options = {
     runtimeVersion: argv.v,
     arch: argv.a,
     cMakeOptions: customOptions,
+    buildArgs: buildArgs,
     silent: argv.i,
     out: argv.O
 };

lib/cMake.js

@@ -278,6 +278,12 @@ CMake.prototype.getBuildCommand = function () {
     if (this.options.target) {
         command.push("--target", this.options.target);
     }
+
+    if (this.options.buildArgs) {
+      command.push('--');
+      command = command.concat(this.options.buildArgs);
+    }
+
     return Promise.resolve(command);
 };
 

tests/es6/testCases.js

@@ -51,6 +51,16 @@ let testCases = {
 
         let command = yield buildSystem.getConfigureCommand();
         assert.notEqual(command.indexOf("-Dfoo=bar"), -1, "custom options added");
+    }),
+    configureWithCustomBuildOptions: async(function*(options) {
+        options = _.extend({
+            directory: path.resolve(path.join(__dirname, "./prototype")),
+            buildArgs: ["-j7"]
+        }, options);
+        let buildSystem = new BuildSystem(options);
+
+        let command = yield buildSystem.getConfigureCommand();
+        assert.notEqual(command.indexOf("-- -j7"), -1, "custom build options added");
     })
 };