device-hip: Preparing for serious device work

3 files changed, 41 insertions, 5 deletions

diff --git a/modules/device-hip/SConstruct b/modules/device-hip/SConstruct
index 429656a..c5b2bb4 100644
--- a/modules/device-hip/SConstruct
+++ b/modules/device-hip/SConstruct
@@ -46,7 +46,11 @@ env_vars.Add('prefix',
 env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
     CPPDEFINES=['SAW_UNIX'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
-    LIBS=['forstio-io'])
+    LIBS=[
+        'forstio-core'
+        'forstio-codec'
+    ]
+);
 env.__class__.add_source_files = add_kel_source_files
 env.Tool('compilation_db');
 env.cdb = env.CompilationDatabase('compile_commands.json');
@@ -58,6 +62,7 @@ env.targets = [];
 
 Export('env')
 SConscript('c++/SConscript')
+SConscript('tests/SConscript')
 
 env.Alias('cdb', env.cdb);
 env.Alias('all', [env.targets]);
diff --git a/modules/device-hip/c++/SConscript b/modules/device-hip/c++/SConscript
index 4ab02d6..57d3992 100644
--- a/modules/device-hip/c++/SConscript
+++ b/modules/device-hip/c++/SConscript
@@ -21,18 +21,18 @@ env.headers += dev_hip_env.headers;
 ## Shared lib
 objects_shared = []
 dev_hip_env.add_source_files(objects_shared, dev_hip_env.sources, shared=True);
-dev_hip_env.library_shared = dev_hip_env.SharedLibrary('#build/forstio-device-hip', [objects_shared]);
+env.library_shared = dev_hip_env.SharedLibrary('#build/forstio-device-hip', [objects_shared]);
 
 ## Static lib
 objects_static = []
 dev_hip_env.add_source_files(objects_static, dev_hip_env.sources, shared=False);
-dev_hip_env.library_static = dev_hip_env.StaticLibrary('#build/forstio-device-hip', [objects_static]);
+env.library_static = dev_hip_env.StaticLibrary('#build/forstio-device-hip', [objects_static]);
 
 # Set Alias
-env.Alias('library_device-hip', [dev_hip_env.library_shared, dev_hip_env.library_static]);
+env.Alias('library_device-hip', [env.library_shared, env.library_static]);
 
 env.targets += ['library_device-hip'];
 
 # Install
-env.Install('$prefix/lib/', [dev_hip_env.library_shared, dev_hip_env.library_static]);
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
 env.Install('$prefix/include/forstio/device/hip/', [dev_hip_env.headers]);
diff --git a/modules/device-hip/tests/SConscript b/modules/device-hip/tests/SConscript
new file mode 100644
index 0000000..608c2b7
--- /dev/null
+++ b/modules/device-hip/tests/SConscript
@@ -0,0 +1,31 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+test_cases_env = env.Clone();
+
+test_cases_env.Append(LIBS=['forstio-test']);
+
+test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+
+env.sources += test_cases_env.sources;
+env.headers += test_cases_env.headers;
+
+objects_static = []
+test_cases_env.add_source_files(objects_static, test_cases_env.sources, shared=False);
+test_cases_env.program = test_cases_env.Program('#bin/tests', [objects_static, env.library_static]);
+
+# Set Alias
+env.Alias('test', test_cases_env.program);
+env.Alias('check', test_cases_env.program);
+
+env.targets += ['test','check'];