Add ability to build minmea with meson

.gitignore

@@ -2,7 +2,7 @@
 *~
 *.diff
 .*.swp
-minmea
-tests
-example
+minmea/tests
+minmea/example
 *.exe
+build

Makefile

@@ -9,23 +9,27 @@ CFLAGS += -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_DARWIN_C_
 CFLAGS += $(shell pkg-config --cflags check)
 LDLIBS += $(shell pkg-config --libs check)
 
+SRC_DIR = minmea
+
 all: scan-build test example
 	@echo "+++ All good."""
 
-test: tests
+test: $(SRC_DIR)/tests
 	@echo "+++ Running Check test suite..."
-	./tests
+	./$(SRC_DIR)/tests
+
+example: $(SRC_DIR)/example
 
 scan-build: clean
 	@echo "+++ Running Clang Static Analyzer..."
-	scan-build $(MAKE) tests
+	scan-build $(MAKE) $(SRC_DIR)/tests
 
 clean:
-	$(RM) tests example *.o
+	$(RM) $(SRC_DIR)/tests $(SRC_DIR)/example $(SRC_DIR)/*.o
 
-tests: tests.o minmea.o
-example: example.o minmea.o
-tests.o: tests.c minmea.h
-minmea.o: minmea.c minmea.h
+$(SRC_DIR)/tests: $(SRC_DIR)/tests.o $(SRC_DIR)/minmea.o
+$(SRC_DIR)/example: $(SRC_DIR)/example.o $(SRC_DIR)/minmea.o
+$(SRC_DIR)/tests.o: $(SRC_DIR)/tests.c $(SRC_DIR)/minmea.h
+$(SRC_DIR)/minmea.o: $(SRC_DIR)/minmea.c $(SRC_DIR)/minmea.h
 
 .PHONY: all test scan-build clean

README.md

@@ -123,6 +123,9 @@ while (fgets(line, sizeof(line), stdin) != NULL) {
 Simply add ``minmea.[ch]`` to your project, ``#include "minmea.h"`` and you're
 good to go.
 
+Alternatively for projects built with `meson`, add this repository in the
+`subprojects` directory and add minmea_dep as a dependency of your project.
+
 ## Running unit tests
 
 Building and running the tests requires the following:
@@ -133,6 +136,9 @@ Building and running the tests requires the following:
 If you have both in your ``$PATH``, running the tests should be as simple as
 typing ``make``.
 
+Alternatively if using `meson` to build minmea, invoke `ninja test` in the
+build directory to run the tests.
+
 ## Limitations
 
 * Only a handful of frames is supported right now.

meson.build

@@ -0,0 +1,79 @@
+project(
+    'minmea',
+    'c',
+    default_options: ['c_std=c99', 'buildtype=debug'],
+)
+
+add_project_arguments(
+    '-Wall', '-Wextra', '-Werror',
+    '-D_POSIX_C_SOURCE=199309L', '-D_BSD_SOURCE', '-D_DEFAULT_SOURCE',
+    '-D_DARWIN_C_SOURCE',
+    language: 'c',
+)
+
+if host_machine.system() == 'windows'
+    add_project_arguments('DMINMEA_INCLUDE_COMPAT')
+endif
+
+c_args = []
+
+if get_option('buildtype') == 'debug'
+    c_args += '-ggdb'
+endif
+
+minmea_includes = include_directories('.')
+
+minmea_sources = ['minmea/minmea.c']
+
+minmea_dependencies = []
+
+minmea_lib = library(
+    'minmea',
+    minmea_sources,
+    include_directories: minmea_includes,
+    dependencies: minmea_dependencies,
+    c_args: c_args,
+)
+
+minmea_dep = declare_dependency(
+    include_directories: minmea_includes,
+    dependencies: minmea_dependencies,
+    link_with: minmea_lib,
+)
+
+if get_option('example')
+    minmea_example_sources = [
+        'minmea/example.c',
+    ]
+
+    minmea_example_dependencies = [
+        minmea_dep,
+    ]
+
+    minmea_example = executable(
+        'example',
+        minmea_example_sources,
+        dependencies: minmea_example_dependencies,
+    )
+endif
+
+if get_option('tests')
+    check = dependency('check')
+
+    minmea_test_sources = [
+        'minmea/tests.c',
+    ]
+
+    minmea_test_dependencies = [
+        check,
+        minmea_dep,
+    ]
+
+    minmea_test = executable(
+        'tests',
+        minmea_test_sources,
+        dependencies: minmea_test_dependencies,
+    )
+
+    test('tests', minmea_test)
+endif

meson_options.txt

@@ -0,0 +1,2 @@
+option('tests', type: 'boolean', value: true)
+option('example', type: 'boolean', value: true)

minmea.c → minmea/minmea.c

@@ -10,7 +10,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <time.h>
 
@@ -85,10 +84,6 @@ bool minmea_check(const char *sentence, bool strict)
     return true;
 }
 
-static inline bool minmea_isfield(char c) {
-    return isprint((unsigned char) c) && c != ',' && c != '*';
-}
-
 bool minmea_scan(const char *sentence, const char *format, ...)
 {
     bool result = false;

minmea.h → minmea/minmea.h

@@ -13,6 +13,7 @@
 extern "C" {
 #endif
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -252,6 +253,14 @@ static inline float minmea_tocoord(struct minmea_float *f)
     return (float) degrees + (float) minutes / (60 * f->scale);
 }
 
+/**
+ * Check whether a character belongs to the set of characters allowed in a
+ * sentence data field.
+ */
+static inline bool minmea_isfield(char c) {
+    return isprint((unsigned char) c) && c != ',' && c != '*';
+}
+
 #ifdef __cplusplus
 }
 #endif