6 files changed, 43 insertions, 7 deletions
diff --git a/modules/codec-json/SConstruct b/modules/codec-json/SConstruct
index edd5f57..20dd972 100644
--- a/modules/codec-json/SConstruct
+++ b/modules/codec-json/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-codec'])
+    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');
@@ -57,7 +61,8 @@ env.headers = [];
 env.targets = [];
 
 Export('env')
-SConscript('SConscript')
+SConscript('c++/SConscript')
+SConscript('tests/SConscript')
 
 env.Alias('cdb', env.cdb);
 env.Alias('all', [env.targets]);
diff --git a/modules/codec-json/SConscript b/modules/codec-json/c++/SConscript
index 772ac0b..868e11e 100644
--- a/modules/codec-json/SConscript
+++ b/modules/codec-json/c++/SConscript
@@ -21,18 +21,18 @@ env.headers += codec_json_env.headers;
 ## Shared lib
 objects_shared = []
 codec_json_env.add_source_files(objects_shared, codec_json_env.sources, shared=True);
-codec_json_env.library_shared = codec_json_env.SharedLibrary('#build/forstio-codec-json', [objects_shared]);
+env.library_shared = codec_json_env.SharedLibrary('#build/forstio-codec-json', [objects_shared]);
 
 ## Static lib
 objects_static = []
 codec_json_env.add_source_files(objects_static, codec_json_env.sources, shared=False);
-codec_json_env.library_static = codec_json_env.StaticLibrary('#build/forstio-codec-json', [objects_static]);
+env.library_static = codec_json_env.StaticLibrary('#build/forstio-codec-json', [objects_static]);
 
 # Set Alias
-env.Alias('library_codec_json', [codec_json_env.library_shared, codec_json_env.library_static]);
+env.Alias('library_codec_json', [env.library_shared, env.library_static]);
 
 env.targets += ['library_codec_json'];
 
 # Install
-env.Install('$prefix/lib/', [codec_json_env.library_shared, codec_json_env.library_static]);
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
 env.Install('$prefix/include/forstio/codec/json/', [codec_json_env.headers]);
diff --git a/modules/codec-json/json.h b/modules/codec-json/c++/json.h
index bc60ee9..bc60ee9 100644
--- a/modules/codec-json/json.h
+++ b/modules/codec-json/c++/json.h
diff --git a/modules/codec-json/json.tmpl.h b/modules/codec-json/c++/json.tmpl.h
index 84f0058..84f0058 100644
--- a/modules/codec-json/json.tmpl.h
+++ b/modules/codec-json/c++/json.tmpl.h
diff --git a/modules/codec-json/tests/SConscript b/modules/codec-json/tests/SConscript
new file mode 100644
index 0000000..608c2b7
--- /dev/null
+++ b/modules/codec-json/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'];
diff --git a/tests/codec-json.cpp b/modules/codec-json/tests/codec-json.cpp
index e1b8b5c..83ec859 100644
--- a/tests/codec-json.cpp
+++ b/modules/codec-json/tests/codec-json.cpp
@@ -1,5 +1,5 @@
 #include <forstio/test/suite.h>
-#include <forstio/codec/json/json.h>
+#include "../c++/json.h"
 
 #include <iostream>