File tree Expand file tree Collapse file tree 2 files changed +4
-8
lines changed
Expand file tree Collapse file tree 2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ vars.Add(PathVariable(
6565vars .Add (EnumVariable (
6666 'build' ,
6767 'compiler settings' ,
68- 'fast' , allowed_values = ('debug' , 'fast ' )))
68+ 'fast' , allowed_values = ('fast' , ' debug' , 'coverage ' )))
6969vars .Add (EnumVariable (
7070 'tool' ,
7171 'C++ compiler toolkit to be used' ,
@@ -76,9 +76,6 @@ vars.Add(BoolVariable(
7676vars .Add (BoolVariable (
7777 'profile' ,
7878 'build with profiling information' , False ))
79- vars .Add (BoolVariable (
80- 'coverage' ,
81- 'build for code coverage analysis' , False ))
8279vars .Add (
8380 'tests' ,
8481 'fixed-string patterns for selecting unit tests' , None )
@@ -91,7 +88,6 @@ env.Help(MY_SCONS_HELP % vars.GenerateHelpText(env))
9188env ['has_objcryst' ] = None
9289btags = [env ['build' ], platform .machine ()]
9390if env ['profile' ]: btags .append ('profile' )
94- if env ['coverage' ]: btags .append ('coverage' )
9591builddir = env .Dir ('build/' + '-' .join (btags ))
9692
9793Export ('env' )
Original file line number Diff line number Diff line change 4444# Configure build variants
4545if env ['build' ] == 'debug' :
4646 env .Append (CCFLAGS = '-g' )
47+ elif env ['build' ] == 'coverage' :
48+ env .Append (CCFLAGS = ['-g' , '--coverage' , '-O0' ])
49+ env .Append (LINKFLAGS = '--coverage' )
4750elif env ['build' ] == 'fast' :
4851 env .AppendUnique (CCFLAGS = ['-O3' ] + fast_optimflags )
4952 env .AppendUnique (CPPDEFINES = {'NDEBUG' : None })
@@ -53,9 +56,6 @@ if env['profile']:
5356 env .AppendUnique (CCFLAGS = '-pg' )
5457 env .AppendUnique (LINKFLAGS = '-pg' )
5558
56- if env ['coverage' ]:
57- env .Append (CCFLAGS = ['--coverage' , '-O0' ])
58- env .Append (LINKFLAGS = '--coverage' )
5959
6060# configure boost and ObjCryst libraries unless non-relevant.
6161skip_configure = (GetOption ('clean' ) or GetOption ('help' ) or
You can’t perform that action at this time.
0 commit comments