Commit 821fea74 authored by Federico Allocati's avatar Federico Allocati
Browse files

Modification to the wscript option --experimental

parent f78f6fea
......@@ -21,5 +21,6 @@ def build(bld):
target='obs_multi_auto_mean',
uselib='BOOST EIGEN TBB LIBCMAES NLOPT',
use='limbo')
if bld.env['BUILD_EXPERIMENTAL'] and bld.env['BUILD_EXPERIMENTAL'] == True:
bld.recurse('experimental/')
if bld.options.experimental:
bld.recurse('experimental/')
......@@ -33,7 +33,7 @@ def options(opt):
opt.add_option('--exp', type='string', help='exp(s) to build, separate by comma', dest='exp')
opt.add_option('--qsub', type='string', help='config file (json) to submit to torque', dest='qsub')
opt.add_option('--oar', type='string', help='config file (json) to submit to oar', dest='oar')
opt.add_option('--experimental', type='string', help='experimental should be compiled? (yes/no)', dest='experimental')
opt.add_option('--experimental', action='store_true', help='specify to compile the experimental examples', dest='experimental')
opt.load('xcode')
for i in glob.glob('exp/*'):
if os.path.isdir(i):
......@@ -60,6 +60,7 @@ def configure(conf):
common_flags = "-Wall -std=c++0x"
else:
common_flags = "-Wall -std=c++11"
common_flags += " -fdiagnostics-color"
opt_flags = " -O3 -march=native -g"
conf.check_boost(lib='serialization filesystem \
......@@ -80,7 +81,6 @@ def configure(conf):
all_flags = common_flags + opt_flags
conf.env['CXXFLAGS'] = conf.env['CXXFLAGS'] + all_flags.split(' ')
conf.env['CXXFLAGS'] += ['-fdiagnostics-color']
print conf.env['CXXFLAGS']
if conf.options.exp:
......@@ -88,10 +88,6 @@ def configure(conf):
print 'configuring for exp: ' + i
conf.recurse('exp/' + i)
if conf.options.experimental and conf.options.experimental == "yes":
conf.env['BUILD_EXPERIMENTAL'] = True
def build(bld):
bld.recurse('src/')
if bld.options.exp:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment