test: Remove unused catch2
Change-Id: I884ee453191c525dfcec0eced9ea8cf8c620a012
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/subprojects/Catch2.wrap b/subprojects/Catch2.wrap
deleted file mode 100644
index bd7f593..0000000
--- a/subprojects/Catch2.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/catchorg/Catch2
-revision = HEAD
diff --git a/test/meson.build b/test/meson.build
index 113b8c1..d29bb43 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -92,60 +92,3 @@
dependencies: gtest_deps))
endforeach
endif
-
-# Switch to `catch2-with-main.pc` when 2.x supports it
-catch2 = dependency('catch2-with-main', required: false)
-if not catch2.found()
- catch2 = dependency('catch2', required: false)
- if catch2.found()
- catch2_main = meson.get_compiler('cpp').find_library(
- 'Catch2WithMain', required: false)
- if catch2_main.found()
- catch2 = declare_dependency(
- dependencies: [
- catch2,
- catch2_main,
- ])
- else
- catch2 = declare_dependency(
- link_with: static_library(
- 'catch2', 'catch2_main.cpp',
- implicit_include_directories: false,
- build_by_default: false,
- dependencies: catch2),
- dependencies: catch2)
- endif
- endif
-endif
-if not catch2.found()
- catch2_opts = import('cmake').subproject_options()
- catch2_opts.add_cmake_defines({
- 'BUILD_TESTING': 'OFF',
- 'CMAKE_CXX_FLAGS': '-Wno-non-virtual-dtor',
- })
- catch2_proj = import('cmake').subproject(
- 'Catch2',
- options: catch2_opts,
- required: false)
- if catch2_proj.found()
- catch2 = declare_dependency(
- dependencies: [
- catch2_proj.dependency('Catch2'),
- catch2_proj.dependency('Catch2WithMain'),
- ])
- else
- assert(not build_tests.enabled(), 'Catch2 is required')
- endif
-endif
-
-catch2_tests = [
-]
-
-if catch2.found()
- foreach t : catch2_tests
- test(t, executable(t.underscorify(), t + '.cpp',
- build_by_default: false,
- implicit_include_directories: false,
- dependencies: [stdplus_dep, catch2]))
- endforeach
-endif