Skip to content

Commit 664d833

Browse files
Merge pull request #114 from andrew-wja/master
Add a build flag to control whether or not the example programs get built
2 parents 46d5927 + d619a8a commit 664d833

File tree

2 files changed

+27
-24
lines changed

2 files changed

+27
-24
lines changed

SConstruct

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ vars.AddVariables(
2929
EnumVariable("arch", "Target Architecture", "armv7a", allowed_values=("armv7a", "arm64-v8a", "arm64-v8.2-a", "x86_32", "x86_64")),
3030
EnumVariable("os", "Target OS", "linux", allowed_values=("linux", "android", "bare_metal")),
3131
EnumVariable("build", "Build type", "cross_compile", allowed_values=("native", "cross_compile")),
32+
BoolVariable("examples", "Build example programs", False),
3233
BoolVariable("Werror", "Enable/disable the -Werror compilation flag", True),
3334
BoolVariable("opencl", "Enable OpenCL support", True),
3435
BoolVariable("neon", "Enable Neon support", False),

sconscript

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -351,30 +351,32 @@ alias = env.Alias("arm_compute",objects)
351351
Default(alias)
352352

353353
# Build examples
354-
test_helpers = env.Object("test_helpers/Utils.cpp")
355354

356-
if env['opencl'] and env['neon']:
357-
for file in Glob("examples/neoncl_*.cpp"):
358-
example = os.path.basename( os.path.splitext(str(file))[0])
359-
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs+['OpenCL'])
360-
alias = env.Alias(example, prog)
361-
Depends(prog, objects)
362-
Default( alias )
363-
364-
if env['opencl']:
365-
for file in Glob("examples/cl_*.cpp"):
366-
example = os.path.basename( os.path.splitext(str(file))[0])
367-
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs+['OpenCL'])
368-
alias = env.Alias(example, prog)
369-
Depends(prog, objects)
370-
Default( alias )
371-
372-
if env['neon']:
373-
for file in Glob("examples/neon_*.cpp"):
374-
example = os.path.basename( os.path.splitext(str(file))[0])
375-
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs)
376-
alias = env.Alias(example, prog)
377-
Depends(prog, objects)
378-
Default( alias )
355+
if env['examples']:
356+
test_helpers = env.Object("test_helpers/Utils.cpp")
357+
358+
if env['opencl'] and env['neon']:
359+
for file in Glob("examples/neoncl_*.cpp"):
360+
example = os.path.basename( os.path.splitext(str(file))[0])
361+
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs+['OpenCL'])
362+
alias = env.Alias(example, prog)
363+
Depends(prog, objects)
364+
Default( alias )
365+
366+
if env['opencl']:
367+
for file in Glob("examples/cl_*.cpp"):
368+
example = os.path.basename( os.path.splitext(str(file))[0])
369+
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs+['OpenCL'])
370+
alias = env.Alias(example, prog)
371+
Depends(prog, objects)
372+
Default( alias )
373+
374+
if env['neon']:
375+
for file in Glob("examples/neon_*.cpp"):
376+
example = os.path.basename( os.path.splitext(str(file))[0])
377+
prog = env.Program(example, ['examples/%s.cpp' % example, test_helpers], LIBS=example_libs)
378+
alias = env.Alias(example, prog)
379+
Depends(prog, objects)
380+
Default( alias )
379381

380382
Export('env')

0 commit comments

Comments
 (0)