diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-05-20 22:45:17 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-05-20 22:45:17 -0500 |
| commit | c404f94d6419d67b0e93f42b7ea45414220e7100 (patch) | |
| tree | 1668a4cec34ecfa0f2211f4c251218c42ac584e9 /acprep | |
| parent | d1444f4c97276d6c89dfca6846f6d62ca7487183 (diff) | |
| download | fork-ledger-c404f94d6419d67b0e93f42b7ea45414220e7100.tar.gz fork-ledger-c404f94d6419d67b0e93f42b7ea45414220e7100.tar.bz2 fork-ledger-c404f94d6419d67b0e93f42b7ea45414220e7100.zip | |
Changed the way that LDFLAGS is passed to CMake
Diffstat (limited to 'acprep')
| -rwxr-xr-x | acprep | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -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 # ######################################################################### |