From 01bbd5fd0af0847ac847c78c7064b3c9810a924a Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Thu, 1 Nov 2018 15:10:51 +0000 Subject: COMPMID-1737: Add support for install_dir Note: Only ComputeLibrary files get copied over (Stub CL / GLES drivers don't, nor are the 3rdparty includes) utils/ files are not copied either (They're not part of the core library) Change-Id: I55e01c0ba4a5f7e649877fcdd11fdb0a51071b18 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/156339 Reviewed-by: Pablo Tello Reviewed-by: Georgios Pinitas Tested-by: bsgcomp --- examples/SConscript | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/SConscript b/examples/SConscript index fbfdaad064..7af8a7fd0e 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -23,6 +23,7 @@ import SCons import os.path Import('env') +Import('install_bin') examples_env = env.Clone() @@ -57,10 +58,12 @@ for file in Glob("./graph_*.cpp"): if env['os'] in ['android', 'bare_metal'] or env['standalone']: prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) + prog = install_bin(prog) Depends(prog, graph_dependency) else: #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) + prog = install_bin(prog) Depends(prog, graph_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -69,6 +72,7 @@ if env['opencl'] and env['neon']: for file in Glob("./neoncl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) + prog = install_bin(prog) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -77,6 +81,7 @@ if env['opencl']: for file in Glob("./cl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) + prog = install_bin(prog) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -85,6 +90,7 @@ if env['neon']: for file in Glob("./neon_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs) + prog = install_bin(prog) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) @@ -93,21 +99,24 @@ if env['gles_compute']: for file in Glob("./gc_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_GC'], LIBS = examples_libs + arm_compute_libs) + prog = install_bin(prog) Depends(prog, arm_compute_dependency) alias = examples_env.Alias(example, prog) Default(alias) #FIXME Delete 3rdparty builds before release for file in Glob("#3rdparty/examples/graph_*.cpp"): - example = os.path.basename(os.path.splitext(str(file))[0]) - prog = None + example = os.path.basename(os.path.splitext(str(file))[0]) + prog = None - if env['os'] in ['android', 'bare_metal'] or env['standalone']: - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) - Depends(prog, graph_dependency) - else: - #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) - Depends(prog, graph_dependency) - alias = examples_env.Alias(example, prog) - Default(alias) + if env['os'] in ['android', 'bare_metal'] or env['standalone']: + prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive']) + prog = install_bin(prog) + Depends(prog, graph_dependency) + else: + #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies + prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) + prog = install_bin(prog) + Depends(prog, graph_dependency) + alias = examples_env.Alias(example, prog) + Default(alias) -- cgit v1.2.1