diff options
author | Craig Earls <enderw88@gmail.com> | 2014-05-09 20:40:42 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2014-05-09 20:40:42 -0700 |
commit | 20b915668f7e6d4be9993e11dfc04ae1760a36f7 (patch) | |
tree | 668de51ac7625355aaaa8c3c88aed82344c690c3 /acprep | |
parent | 2906a2f759b67363c070161202596e746921f09c (diff) | |
parent | dbfbf2bc893de3c44dcc08c33811bc274f647672 (diff) | |
download | fork-ledger-20b915668f7e6d4be9993e11dfc04ae1760a36f7.tar.gz fork-ledger-20b915668f7e6d4be9993e11dfc04ae1760a36f7.tar.bz2 fork-ledger-20b915668f7e6d4be9993e11dfc04ae1760a36f7.zip |
Merge commit 'dbfbf2bc893de3c44dcc08c33811bc274f647672'
Diffstat (limited to 'acprep')
-rwxr-xr-x | acprep | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -875,6 +875,9 @@ class PrepareBuild(CommandLineApp): if self.options.boost_include: conf_args.append('-DBOOST_INCLUDEDIR=%s' % self.options.boost_include) + if self.options.build_dir: + conf_args.append('-DBUILD_DIR=%s' % + self.options.build_dir) if self.prefix_directory(): conf_args.append('-DCMAKE_INSTALL_PREFIX=%s' % self.prefix_directory()) @@ -942,7 +945,7 @@ class PrepareBuild(CommandLineApp): make_args.append('-j%d' % self.options.jobs) if self.options.verbose: - make_args.append('VERBOSE=1') + make_args.append('-v' if self.options.use_ninja else 'VERBOSE=1') self.log.debug('Configure arguments => ' + str(config_args)) self.log.debug('Makefile arguments => ' + str(make_args)) |