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

Changed the way that LDFLAGS is passed to CMake

Browse source
This commit is contained in:
John Wiegley 2012-05-20 22:45:17 -05:00
parent d1444f4c97
commit c404f94d64
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
acprep
View file

@ -775,7 +775,15 @@ class PrepareBuild(CommandLineApp):
for var in ('CXX', 'CXXFLAGS', 'LDFLAGS'):
if self.envvars.has_key(var) and self.envvars[var] and \
(var.endswith('FLAGS') or exists(self.envvars[var])):
conf_args.append('%s=%s' % (var, self.envvars[var]))
if var == 'CXX':
conf_args.append('-DCMAKE_CXX_COMPILER=%s' %
self.envvars[var])
elif var == 'CXXFLAGS':
conf_args.append('-DCMAKE_CXX_FLAGS=%s' %
self.envvars[var])
elif var == 'LDFLAGS':
conf_args.append('-DCMAKE_EXE_LINKER_FLAGS=%s' %
self.envvars[var])
if self.options.boost_root:
conf_args.append('-DBOOST_ROOT=%s' %
@ -953,11 +961,6 @@ class PrepareBuild(CommandLineApp):
#self.phase_make('check')
self.phase_make('test')
self.configure_flavor('debug', reset=False)
self.log.info('=== Testing debug ===')
#self.phase_make('fullcheck')
self.phase_make('test')
self.configure_flavor('default', reset=False)
self.log.info('=== Testing default ===')
#self.phase_make('fullcheck')
@ -965,29 +968,30 @@ class PrepareBuild(CommandLineApp):
# jww (2012-05-20): docs are not working yet
#self.phase_make('docs')
self.configure_flavor('debug', reset=False)
self.log.info('=== Testing debug ===')
#self.phase_make('fullcheck')
self.phase_make('test')
def phase_makeall(self, reset=False, *args):
self.log.info('Executing phase: makeall')
self.configure_flavor('opt', reset)
self.log.info('=== Building opt ===')
self.phase_make(*args)
self.configure_flavor('gcov', reset)
self.log.info('=== Building gcov ===')
self.phase_make(*args)
self.configure_flavor('default', reset)
self.log.info('=== Building default ===')
self.phase_make(*args)
self.configure_flavor('debug', reset)
self.log.info('=== Building debug ===')
self.phase_make(*args)
self.configure_flavor('default', reset)
#########################################################################
# Help #
#########################################################################