commit 165308cf6904f800206217ad2f09b8e5c8d5c286
author Michalis Spyrou <michalis.spyrou@arm.com> Wed Apr 10 10:10:21 2019 +0100
committer Michalis Spyrou <michalis.spyrou@arm.com> Wed Apr 10 10:21:42 2019 +0000
tree 44b7c6300626465f7110a0701d9cff84896943d5
parent 4d0351cf322df51baa5a445f637008992aa37809

COMPMID-1995: Fix examples SConsscript install_dir

Change-Id: I9b0fd4620589fa7ae1b84d965cb17c8d8310d867
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/965
Reviewed-by: Isabella Gottardi <isabella.gottardi@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

examples/SConscript

diff --git a/examples/SConscript b/examples/SConscript
index 7af8a7f..d08aa9d 100644
--- a/examples/SConscript
+++ b/examples/SConscript
@@ -58,13 +58,13 @@
 
     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)
+        prog = install_bin(prog)
     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)
+        prog = install_bin(prog)
     alias = examples_env.Alias(example, prog)
     Default(alias)
 
@@ -72,8 +72,8 @@
     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)
+        prog = install_bin(prog)
         alias = examples_env.Alias(example, prog)
         Default(alias)
 
@@ -81,8 +81,8 @@
     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)
+        prog = install_bin(prog)
         alias = examples_env.Alias(example, prog)
         Default(alias)
 
@@ -90,8 +90,8 @@
     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)
+        prog = install_bin(prog)
         alias = examples_env.Alias(example, prog)
         Default(alias)
 
@@ -99,8 +99,8 @@
     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)
+        prog = install_bin(prog)
         alias = examples_env.Alias(example, prog)
         Default(alias)
 
@@ -111,12 +111,12 @@
 
     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)
+        prog = install_bin(prog)
     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)
+        prog = install_bin(prog)
     alias = examples_env.Alias(example, prog)
     Default(alias)