From 797cba6ba04cdb29968236ed9720c73017012f20 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Tue, 25 Feb 2025 00:48:28 +0100
Subject: [PATCH] git subrepo clone (merge) --force
git@github.com:agauniyal/rang.git packages/rang
subrepo:
subdir: "packages/rang"
merged: "22345aa4c"
upstream:
origin: "git@github.com:agauniyal/rang.git"
branch: "master"
commit: "22345aa4c"
git-subrepo:
version: "0.4.9"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "30db3b8"
---
packages/rang/.gitrepo | 6 +++---
packages/rang/meson.build | 15 +++++++++++----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/packages/rang/.gitrepo b/packages/rang/.gitrepo
index 07b36cbe1..7ef7be6c1 100644
--- a/packages/rang/.gitrepo
+++ b/packages/rang/.gitrepo
@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:agauniyal/rang.git
branch = master
- commit = a083cae9d64edd66d0ecdd4ddebac20d090c8693
- parent = d97199d99e580797e39a626ad2ac6d87c125bcb5
- cmdver = 0.4.3
+ commit = 22345aa4c468db3bd4a0e64a47722aad3518cc81
+ parent = 37eab58364fa6512f2886a6a0996171974ca2e4b
+ cmdver = 0.4.9
method = merge
diff --git a/packages/rang/meson.build b/packages/rang/meson.build
index 0a7491a81..62c202032 100644
--- a/packages/rang/meson.build
+++ b/packages/rang/meson.build
@@ -3,8 +3,15 @@ project('rang', 'cpp', version : '3.2.0',
inc = include_directories('include')
-doctest = dependency('doctest')
-subdir('test')
+rang_dep = declare_dependency(include_directories:inc)
-run_target('cppcheck', command : ['cppcheck', '--project=' +
- join_paths(meson.build_root(), 'compile_commands.json')])
+doctest = dependency('doctest', required: false)
+if doctest.found()
+ subdir('test')
+endif
+
+cppcheck = find_program('cppcheck', required: false)
+if cppcheck.found()
+ run_target('cppcheck', command : ['cppcheck', '--project=' +
+ join_paths(meson.build_root(), 'compile_commands.json')])
+endif
--
GitLab