Fixed issues regarding the example Meson project.

examples/example_4/meson.build

@@ -10,6 +10,9 @@
 ###################################################################################
 
 
+project('example-4')
+
+unity_dep = dependency('unity', fallback : ['unity', 'unity_dep'])
 
 example_dir = include_directories('.', join_paths('.', 'src'))
 

examples/example_4/readme.txt

@@ -2,7 +2,7 @@ Example 4
 =========
 
 Close to the simplest possible example of Unity, using only basic features.
-to build this example run meson setup <build dir name>.
+to build this example run "meson setup <build dir name>".
 
 Meson uses the Ninja build system to actually build the code. To start the 
 build, simply type the following command.  
@@ -11,4 +11,5 @@ build, simply type the following command.
 
 Meson provides native support for running tests. The command to do that is simple.
 
-"meson test -C <build dir name>".
\ No newline at end of file
+"meson test -C <build dir name>".
+ 
\ No newline at end of file

examples/example_4/src/meson.build

@@ -11,13 +11,21 @@
 
 
 
-example_src = files('ProductionCode.c', 'ProductionCode2.c')
+a_lib = library(
+    'production-code-1', 
+    'ProductionCode.c',
+    include_directories: example_dir)
+
+b_lib = library(
+    'production-code-2',
+    'ProductionCode2.c',
+    include_directories: example_dir)
+
 
-example_lib = library(meson.project_name(), 
-    sources: example_src,
+a_dep = declare_dependency(
+    link_with: a_lib,
     include_directories: example_dir)
 
-example_dep = declare_dependency(
-    version: meson.project_version(),
-    link_with: example_lib,
+b_dep = declare_dependency(
+    link_with: b_lib,
     include_directories: example_dir)
\ No newline at end of file

examples/example_4/subprojects/unity.wrap

+[wrap-git]
+directory = unity
+url = https://github.com/squidfarts/Unity.git
+revision = head

examples/example_4/test/TestProductionCode.c

@@ -17,11 +17,6 @@ void tearDown(void)
 {
 }
 
-void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void);
-void test_FindFunction_WhichIsBroken_ShouldReturnTheIndexForItemsInList_WhichWillFailBecauseOurFunctionUnderTestIsBroken(void);
-void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValue(void);
-void test_FunctionWhichReturnsLocalVariable_ShouldReturnTheCurrentCounterValueAgain(void);
-void test_FunctionWhichReturnsLocalVariable_ShouldReturnCurrentCounter_ButFailsBecauseThisTestIsActuallyFlawed(void);
 
 void test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode(void)
 {

examples/example_4/test/test_runners/meson.build

@@ -20,5 +20,5 @@ test_src_2 = [
     join_paths('..' ,'TestProductionCode2.c') 
     ]
 
-test('Test production code one', executable('test-1', test_src_1, dependencies: [ example_dep, unity_dep ]))
-test('Test production code two', executable('test-2', test_src_2, dependencies: [ example_dep, unity_dep ]))
\ No newline at end of file
+test('Test production code one', executable('test-1', test_src_1, dependencies: [ a_dep, unity_dep ]))
+test('Test production code two', executable('test-2', test_src_2, dependencies: [ b_dep, unity_dep ]))
\ No newline at end of file

examples/meson.build

-###################################################################################
-#                                                                                 #
-# NAME: examples/meson.build                                                      #
-#                                                                                 #
-# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams.                         #
-# WRITTEN BY: Michael Brockus.                                                    #
-#                                                                                 #
-# License: MIT                                                                    #
-#                                                                                 #
-###################################################################################
-
-
-
-subdir('example_4')
\ No newline at end of file

meson.build

@@ -77,9 +77,4 @@ subdir('src')
 unity_dep = declare_dependency(
     version: meson.project_version(),
     link_with: unity_lib,
-    include_directories: unity_dir)
-
-
-if get_option('with_examples').enabled()
-    subdir('examples')
-endif
\ No newline at end of file
+    include_directories: unity_dir)
\ No newline at end of file

meson_options.txt

-###################################################################################
-#                                                                                 #
-# NAME: meson_options.txt                                                         #
-#                                                                                 #
-# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams.                         #
-# WRITTEN BY: Michael Brockus.                                                    #
-#                                                                                 #
-# License: MIT                                                                    #
-#                                                                                 #
-###################################################################################
-
-
-
-option('with_examples', 
-    type: 'feature', value : 'disabled', 
-    description: 'Enable Unity for unit testing.'
-)
\ No newline at end of file