diff options
author | Anthony Barbier <anthony.barbier@arm.com> | 2017-10-05 14:55:34 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | a4e5e1e68069e5ac8a776a28211178fd959b13f2 (patch) | |
tree | 5284f081a379d5ebe21934a31f131a1888b4c9a4 | |
parent | 6e52ba3af3c0c22de6d340b18a8e186c4f362005 (diff) | |
download | ComputeLibrary-a4e5e1e68069e5ac8a776a28211178fd959b13f2.tar.gz |
COMPMID-556 Don't build computer_vision and arm_compute_validation_old in non-internal builds
Change-Id: Id4d03880ddec9c29d515724134c654221804b513
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90392
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | tests/SConscript | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 4428a09cd0..4ef67efe0c 100644 --- a/SConstruct +++ b/SConstruct @@ -52,6 +52,8 @@ vars.AddVariables( BoolVariable("openmp", "Enable OpenMP backend", False), BoolVariable("cppthreads", "Enable C++11 threads backend", True), PathVariable("build_dir", "Specify sub-folder for the build", ".", PathVariable.PathAccept), + #FIXME Remove before release (And remove all references to INTERNAL_ONLY) + BoolVariable("internal_only", "Enable ARM internal only tests", True), ("extra_cxx_flags", "Extra CXX flags to be appended to the build command", "") ) diff --git a/tests/SConscript b/tests/SConscript index 6b826d0c84..ccda55b649 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -28,12 +28,11 @@ Import('vars') SConscript('./framework/SConscript', duplicate=0) #FIXME: Remove before release -SConscript('./validation_old/SConscript', duplicate=0) +if env['internal_only']: + SConscript('./validation_old/SConscript', duplicate=0) # vars is imported from arm_compute: variables = [ - #FIXME Remove before release (And remove all references to INTERNAL_ONLY) - BoolVariable("internal_only", "Enable ARM internal only tests", True), BoolVariable("validation_tests", "Build validation test programs", True), BoolVariable("benchmark_tests", "Build benchmark test programs", True) ] @@ -65,7 +64,7 @@ else: arm_compute_lib = arm_compute_so #FIXME Delete before release -if test_env['internal_only']: +if env['internal_only']: test_env.Append(CPPDEFINES=['INTERNAL_ONLY']) test_env.Append(CPPPATH = ["#3rdparty/include"]) |