From 2554472a6cf44d87ea4c0a77d87622c963d95219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Guzm=C3=A1n?= <jonguz5@hotmail.com>
Date: Fri, 16 Dec 2022 22:44:34 -0600
Subject: [PATCH] add meson samples

---
 examples/example1/meson.build | 20 ++++++++++----------
 examples/example2/meson.build | 24 +++++++++---------------
 examples/meson.build          |  2 ++
 meson.build                   | 14 +-------------
 4 files changed, 22 insertions(+), 38 deletions(-)
 create mode 100644 examples/meson.build

diff --git a/examples/example1/meson.build b/examples/example1/meson.build
index bd4931a..e6dee9e 100644
--- a/examples/example1/meson.build
+++ b/examples/example1/meson.build
@@ -1,20 +1,20 @@
 
 
-sqlitecpp_dep = dependency(
-                'sqlitecpp_dep',
-                fallback: ['SQLiteCpp', 'sqlitecpp_dep']
-)
-
 example1_sources = files(
     'main.cpp'
 )
 
-example1_dependencies = [
-    dependency('SQLite')
-]
+example1_args = []
+
+## under windows define _CRT_SECURE_NO_WARNINGS
+if host_machine.system() == 'windows'
+    example1_args += ['-D_CRT_SECURE_NO_WARNINGS']
+endif
+
 
 sqlitecpp_demo1_exe = executable('SQLITECPP_sample_demo1',
                             sqlitecpp_sample1_srcs,
                             dependencies: sqlitecpp_dep,
-                            # override the default options
-                            override_options: sqlitecpp_opts,)
\ No newline at end of file
+                            # inherit the default options from sqlitecpp
+                            override_options: sqlitecpp_opts,
+                            cpp_args: example1_args,)
\ No newline at end of file
diff --git a/examples/example2/meson.build b/examples/example2/meson.build
index 7583449..c6e588f 100644
--- a/examples/example2/meson.build
+++ b/examples/example2/meson.build
@@ -1,20 +1,14 @@
-
-
-sqlitecpp_dep = dependency(
-                'sqlitecpp_dep',
-                fallback: ['SQLiteCpp', 'sqlitecpp_dep']
-)
-
-example1_sources = files(
+example2_srcs = files(
     'src/main.cpp'
 )
 
-example1_dependencies = [
-    dependency('SQLite')
-]
+# if running on windows define _CRT_SECURE_NO_WARNINGS
+example2_args = []
 
-sqlitecpp_demo1_exe = executable('SQLITECPP_sample_demo1',
-                            sqlitecpp_sample1_srcs,
+
+sqlitecpp_demo2_exe = executable('SQLITECPP_sample_demo1',
+                            sqlitecpp_sample2_srcs,
                             dependencies: sqlitecpp_dep,
-                            # override the default options
-                            override_options: sqlitecpp_opts,)
\ No newline at end of file
+                            # inherit the default options from sqlitecpp
+                            override_options: sqlitecpp_opts,
+                            cpp_args: example2_args)
\ No newline at end of file
diff --git a/examples/meson.build b/examples/meson.build
new file mode 100644
index 0000000..0fc7a16
--- /dev/null
+++ b/examples/meson.build
@@ -0,0 +1,2 @@
+subdir('example1')
+subdir('example2')
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 773b1ef..3edeb59 100644
--- a/meson.build
+++ b/meson.build
@@ -271,19 +271,7 @@ if get_option('SQLITECPP_BUILD_TESTS')
     test('sqlitecpp unit tests', testexe, args: test_args)
 endif
 if get_option('SQLITECPP_BUILD_EXAMPLES')
-    ## demo 1 executable
-    sqlitecpp_demo1_exe = executable('SQLITECPP_sample_demo1',
-                            sqlitecpp_sample1_srcs,
-                            dependencies: sqlitecpp_dep,
-                            # override the default options
-                            override_options: sqlitecpp_opts,)
-    ## demo 2 executable
-    sqlitecpp_demo1_exe = executable('SQLITECPP_sample_demo2',
-                            sqlitecpp_sample2_srcs,
-                            dependencies: sqlitecpp_dep,
-                            # override the default options
-                            override_options: sqlitecpp_opts,)
-                    
+    subdir('examples')
 endif
 
 pkgconfig = import('pkgconfig')