From 2e407c7d1a8b695d2c097f274a6e6e42ed565322 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:07:10 +0000
Subject: [PATCH] Re-introduce -DHAVE_BOOST to cppcheck builds

A regression introduced in cppcheck 2.15.0 has been fixed in 2.16.0

(cherry picked from commit 01c262abddf05fb2c5b37734c2af30fcb415242d)
---
 scripts/install_cppcheck.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/install_cppcheck.sh b/scripts/install_cppcheck.sh
index 5dd45e80..16a18e5d 100755
--- a/scripts/install_cppcheck.sh
+++ b/scripts/install_cppcheck.sh
@@ -149,9 +149,13 @@ fi
             # Cppcheck 2.8 added optional support for utilizing Boost
             make_args="$make_args CPPFLAGS=-DHAVE_BOOST"
             ;;
-        2.*)
+        2.15.*)
             # Cppcheck 2.15 doesn't seem to define FILESDIR if CPPFLAGS is set
             ;;
+        2.*)
+            # Cppcheck 2.16 (and later) fixes the HAVE_BOOST issue
+            make_args="$make_args CPPFLAGS=-DHAVE_BOOST"
+            ;;
     esac
 
     # Use all available CPUs