meta: support headers-only mode and C++ with freestanding headers

Author: no92

.github/workflows/ci.cross-file

@@ -0,0 +1,9 @@
+[binaries]
+c = ['gcc-13']
+cpp = ['g++-13']
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'

.github/workflows/ci.yml

@@ -5,22 +5,29 @@ on: [push, pull_request]
 jobs:
     build-lil:
         name: Build lil
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
           - name: Install prerequisites
             run: |
                 set -x
                 sudo apt-get update
-                sudo apt-get install meson
+                sudo apt-get install gcc-13 ninja-build
+                pip3 install meson
           - name: Checkout lil
             uses: actions/checkout@v2
           - name: Prepare build
             run: |
                 set -x
-                mkdir -p build/
-                meson setup --buildtype=debugoptimized build/
+                mkdir -p build build-util
+                meson setup --buildtype=debugoptimized --cross-file=.github/workflows/ci.cross-file build/
+                meson setup --buildtype=debugoptimized --native-file=.github/workflows/ci.cross-file -Dbuild_utils=true build-util/
           - name: Build lil
             run: |
                 set -x
                 ninja
             working-directory: build/
+          - name: Build lil-utils
+            run: |
+                set -x
+                ninja
+            working-directory: build-util/

meson.build

@@ -1,8 +1,17 @@
-project('lil', ['c'], default_options: ['warning_level=2'])
+project('lil', ['c', 'cpp'],
+	default_options: ['warning_level=2', 'c_std=gnu2x', 'cpp_std=gnu++23'],
+	meson_version: '>=1.3.0',
+)
+
+header_only = get_option('header_only')
+build_utils = get_option('build_utils')
 
-add_project_arguments(['-Wno-unused-function', '-Wno-unused-variable', '-Wno-unused-parameter', '-Wimplicit-fallthrough'], language: 'c')
+if not header_only and (meson.get_compiler('cpp').get_id() != 'gcc' or meson.get_compiler('cpp').version().version_compare('<13'))
+	error('At least GCC g++ 13 is needed to compile lil.')
+endif
 
-c_std = 'gnu2x'
+add_project_arguments(['-Wno-unused-function', '-Wno-unused-variable', '-Wno-unused-parameter', '-Wimplicit-fallthrough'], language: ['c', 'cpp'])
+add_project_arguments(['-Werror=incompatible-pointer-types'], language: ['c'])
 
 sources = files(
     'src/edid.c',
@@ -32,9 +41,14 @@ util_vbt_sources = files(
 )
 
 include_directories = include_directories('include')
-library = static_library('lil', sources, include_directories: include_directories, pic: false)
-dependency = declare_dependency(link_with: library, include_directories: include_directories)
 
-if get_option('build_utils')
-	util_vbt = executable('vbt', util_vbt_sources, dependencies: dependency, native: true)
+if header_only
+	lil_dep = declare_dependency(include_directories: include_directories)
+else
+	library = static_library('lil', sources, include_directories: include_directories, pic: false, install: not header_only)
+	lil_dep = declare_dependency(link_with: library, include_directories: include_directories)
+endif
+
+if build_utils
+	util_vbt = executable('vbt', util_vbt_sources, dependencies: lil_dep, native: true, install: true)
 endif

meson_options.txt

@@ -1 +1,2 @@
 option('build_utils', type : 'boolean', value : false)
+option('header_only', type : 'boolean', value : false)