Merge pull request #1091 from mrapp-ke/merge-bugfix

Merge bugfix into feature branch
mrapp-ke · Oct 23, 2024 · 734eca8 · 734eca8
2 parents 75d2c91 + 5db7d7a
commit 734eca8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
@@ -1,5 +1,6 @@
 filter=-build/include_subdir
 filter=-build/include_order
+filter=-build/include_what_you_use
 filter=-build/c++11
 
 filter=-legal/copyright

diff --git a/cpp/meson.build b/cpp/meson.build
@@ -1,4 +1,4 @@
-project('mlrl', default_options : ['cpp_std=c++20', 'buildtype=release', 'werror=true'])
+project('mlrl', meson_version : '>=1.1', default_options : ['cpp_std=c++20', 'buildtype=release', 'werror=true'])
 
 subprojects = get_option('subprojects')
 

diff --git a/cpp/subprojects/common/meson.build b/cpp/subprojects/common/meson.build
@@ -1,4 +1,4 @@
-project('common', 'cpp')
+project('common', 'cpp', meson_version : '>=1.1')
 
 # Source files
 source_files = [

diff --git a/python/meson.build b/python/meson.build
@@ -1,4 +1,4 @@
-project('mlrl-python', default_options : ['cpp_std=c++17', 'buildtype=release'])
+project('mlrl-python', meson_version : '>=1.1', default_options : ['cpp_std=c++17', 'buildtype=release'])
 
 subprojects = get_option('subprojects')
 

diff --git a/scons/requirements.txt b/scons/requirements.txt
@@ -1,11 +1,11 @@
 build >= 1.2, < 1.3
-cpplint >= 1.6, < 1.7
+cpplint >= 2.0, < 2.1
 clang-format >= 19.1, < 19.2
 cython >= 3.0, < 3.1
 isort >= 5.13, < 5.14
 mdformat >= 0.7, < 0.8
-mdformat-myst >= 0.1, < 0.2
-meson >= 1.5, < 1.6
+mdformat-myst >= 0.2, < 0.3
+meson >= 1.6, < 1.7
 ninja >= 1.11, < 1.12
 pylint >= 3.3, < 3.4
 setuptools