Merge pull request #3 from pidupuis/develop

Add arguments for CMake

Gruntfile.js

@@ -62,7 +62,7 @@ module.exports = function(grunt) {
       },
       cmake: {
         options: {
-          cmake: true
+          cmake: ['.']
         },
         projects: [
           'test/fixtures/cmake'

README.md

@@ -4,7 +4,7 @@
 
 ## Description
 
-If your project integrates subprojects using GNU Make, this plugin is made for you! With this plugin you will be able to run any Make rules from any Makefile inside any Grunt task.
+If your project integrates subprojects using [GNU Make](http://www.gnu.org/software/make/), this plugin is made for you! With this plugin you will be able to run any Make rules from any Makefile inside any Grunt task.
 
 Numerous use cases including:
 * Build your Make-based subprojects during the build of your Grunt-based parent project,
@@ -58,10 +58,9 @@ grunt.initConfig({
 ### Options
 
 #### options.cmake
-Type: `bool`
-Default value: `true`
+Type: `Array`
 
-Determines if you want to run `cmake` before `make` to generate the Makefile.
+Determines if you want to run `cmake` before `make` to generate the Makefile. The array contains the list of arguments (including the working path directory !).
 
 ### Usage Examples
 
@@ -70,13 +69,13 @@ grunt.initConfig({
   submake: {
     target1: {
       projects: {
-        // For each of these projects, the specified make tasks will be executed:
+        // For each of these projects, the specified make rules will be executed:
         'sub-projects/module': '',
         'sub-projects/module2': 'build'
       }
     },
     target2: {
-      // Use an array to run multiple tasks:
+      // Use an array to run multiple rules:
       'sub-projects/module': [ 'clean', 'test' ]
     },
     target3: {
@@ -89,9 +88,9 @@ grunt.initConfig({
       'sub-projects/module2'
     ],
     target5: {
-      // you can run cmake before make tasks:
+      // you can run cmake (with arguments) before make:
       options: {
-        cmake: true
+        cmake: ['.']
       },
       projects: [
         'sub-projects/module'
@@ -113,5 +112,5 @@ Do not hesitate to open an [issue](https://github.com/pidupuis/grunt-submake/iss
 
 ## Release History
 
-* Coming soon: CMake arguments
-* 0.1.0: Run `make` rules  (with arguments or not) for specific paths; Can also run CMake beforehand to generate the Makefile
+* ~0.2.0: CMake command can now be run with arguments
+* ~0.1.0: Run `make` rules  (with arguments or not) for specific paths; Can also run CMake beforehand to generate the Makefile

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-submake",
   "description": "Run Make rules through Grunt tasks (by just specifying the Makefile path and the rules!)",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "homepage": "https://github.com/pidupuis/grunt-submake",
   "author": {
     "name": "pidupuis",

tasks/submake.js

@@ -12,10 +12,10 @@ var async = require('async');
 
 module.exports = function(grunt) {
 
-  var runCMake = function(path, next) {
+  var runCMake = function(path, args, next) {
     grunt.util.spawn({
       cmd: 'cmake',
-      args: ['.'],
+      args: args,
       opts: {
         cwd: path
       }
@@ -50,7 +50,7 @@ module.exports = function(grunt) {
         }
         next();
       });
-      
+
     });
   };
 
@@ -61,6 +61,10 @@ module.exports = function(grunt) {
     if (this.data.options) {
       if (this.data.options.cmake) {
         cmake = true;
+        var cmakeArgs = this.data.options.cmake;
+        if (!(cmakeArgs instanceof Array)) {
+          cmakeArgs = [cmakeArgs];
+        }
       }
     }
 
@@ -81,9 +85,9 @@ module.exports = function(grunt) {
         if (!(tasks instanceof Array)) {
           tasks = [tasks];
         }
-        
+
         if (cmake) {
-          runCMake(path, function() {
+          runCMake(path, cmakeArgs, function() {
             runMake(path, tasks, function() {
               callback();
             });