sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes for CMake

Browse source
This commit is contained in:
John Wiegley 2012-09-21 15:12:38 -05:00
parent f995d143c5
commit 7c288b956d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
acprep
View file

@ -657,11 +657,12 @@ class PrepareBuild(CommandLineApp):
#########################################################################
def setup_for_johnw(self):
self.configure_args.append('-GNinja')
self.configure_args.append('-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON')
self.configure_args.append('-DBoost_USE_MULTITHREADED:BOOL=OFF')
if not self.options.compiler:
self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/stow/clang-3.1/bin/clang++')
self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/bin/clang++')
self.CXXFLAGS.append('-Qunused-arguments')
self.CXXFLAGS.append('-nostdlibinc')
@ -910,7 +911,6 @@ class PrepareBuild(CommandLineApp):
if self.options.jobs > 1 and self.current_flavor != 'gcov':
make_args.append('-j%d' % self.options.jobs)
make_args.append('ARGS=-j%d' % self.options.jobs)
if self.options.verbose:
make_args.append('VERBOSE=1')
@ -932,12 +932,11 @@ class PrepareBuild(CommandLineApp):
def phase_check(self, *args):
self.log.info('Executing phase: update')
self.phase_make(*(['check'] + list(args)))
self.execute(*(['ctest'] + make_args))
def phase_update(self, *args):
self.log.info('Executing phase: update')
self.phase_pull()
#self.phase_check(*args)
self.phase_make(*args)
#########################################################################