Added docs for build_args

bhdouglass · Aug 1, 2018 · d613f42 · d613f42
1 parent e905e87
commit d613f42
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/clickable/build_templates/cmake.py b/clickable/build_templates/cmake.py
@@ -10,8 +10,8 @@ def make_install(self):
     def _build(self):
         command = 'cmake'
 
-        if self.config.conf_opts:
-            command = '{} {}'.format(command, self.config.conf_opts)
+        if self.config.build_args:
+            command = '{} {}'.format(command, self.config.build_args)
 
         self.run_container_command('{} {}'.format(command, self.cwd))
 

diff --git a/clickable/build_templates/qmake.py b/clickable/build_templates/qmake.py
@@ -20,8 +20,8 @@ def _build(self):
         else:
             raise Exception('{} is not supported by the qmake build yet'.format(self.build_arch))
 
-        if self.config.conf_opts:
-            command = '{} {}'.format(command, self.config.conf_opts)
+        if self.config.build_args:
+            command = '{} {}'.format(command, self.config.build_args)
 
         self.run_container_command('{} {}'.format(command, self.cwd))
 

diff --git a/clickable/config.py b/clickable/config.py
@@ -37,7 +37,7 @@ class Config(object):
         'make_jobs': 0,
         'gopath': None,
         'docker_image': None,
-        'conf_opts': None,
+        'build_args': None,
     }
 
     PURE_QML_QMAKE = 'pure-qml-qmake'

diff --git a/docs/clickable-json.rst b/docs/clickable-json.rst
@@ -163,3 +163,8 @@ gopath
 ------
 
 Optional, the gopath on the host machine. If left blank, the ``GOPATH`` env var will be used.
+
+build_args
+----------
+
+Optional, arguments to pass to qmake or cmake. Ex: ``CONFIG+=ubuntu``