Remove Catch2 submodule, use meson wrap
Catch2 seems to be Meson-ready now so removing custom meson file too
This commit is contained in:
parent
df2f614642
commit
100b1d557e
4 changed files with 6 additions and 15 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +0,0 @@
|
||||||
[submodule "lib/Catch2"]
|
|
||||||
path = subprojects/Catch2/Catch2
|
|
||||||
url = https://github.com/catchorg/Catch2.git
|
|
6
subprojects/Catch2.wrap
Normal file
6
subprojects/Catch2.wrap
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
[wrap-git]
|
||||||
|
revision = 05e10dfccc28c7f973727c54f850237d07d5e10f
|
||||||
|
url = https://github.com/catchorg/Catch2.git
|
||||||
|
|
||||||
|
[provide]
|
||||||
|
catch2_dep = Catch2-3.5.2
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 531a149ae70dd4143ba1ac28e33d40ab612d3897
|
|
|
@ -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)
|
|
Loading…
Reference in a new issue