From 100b1d557ef833bb17d3b44ad284cffb2a4e28ef Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Thu, 15 Feb 2024 22:35:58 +0100 Subject: [PATCH] Remove Catch2 submodule, use meson wrap Catch2 seems to be Meson-ready now so removing custom meson file too --- .gitmodules | 3 --- subprojects/Catch2.wrap | 6 ++++++ subprojects/Catch2/Catch2 | 1 - subprojects/Catch2/meson.build | 11 ----------- 4 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 subprojects/Catch2.wrap delete mode 160000 subprojects/Catch2/Catch2 delete mode 100644 subprojects/Catch2/meson.build diff --git a/.gitmodules b/.gitmodules index a4caa47..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "lib/Catch2"] - path = subprojects/Catch2/Catch2 - url = https://github.com/catchorg/Catch2.git diff --git a/subprojects/Catch2.wrap b/subprojects/Catch2.wrap new file mode 100644 index 0000000..0e9ad77 --- /dev/null +++ b/subprojects/Catch2.wrap @@ -0,0 +1,6 @@ +[wrap-git] +revision = 05e10dfccc28c7f973727c54f850237d07d5e10f +url = https://github.com/catchorg/Catch2.git + +[provide] +catch2_dep = Catch2-3.5.2 diff --git a/subprojects/Catch2/Catch2 b/subprojects/Catch2/Catch2 deleted file mode 160000 index 531a149..0000000 --- a/subprojects/Catch2/Catch2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 531a149ae70dd4143ba1ac28e33d40ab612d3897 diff --git a/subprojects/Catch2/meson.build b/subprojects/Catch2/meson.build deleted file mode 100644 index 0eb0ce2..0000000 --- a/subprojects/Catch2/meson.build +++ /dev/null @@ -1,11 +0,0 @@ -project('Catch2', - version: '2.13.6', - meson_version: '>=0.54.0', -) - -public_incl = include_directories('Catch2/single_include') -catch2_dep = declare_dependency( - include_directories: public_incl -) - -meson.override_dependency(meson.project_name(), catch2_dep)