| Message ID | 20190807195132.7538-1-alexander.stein@mailbox.org |
|---|---|
| State | New |
| Headers | show |
| Series | [libgpiod,1/5] bindings: cxx: Use 'upstream' include path | expand |
diff --git a/bindings/cxx/tests/gpiod-cxx-test.cpp b/bindings/cxx/tests/gpiod-cxx-test.cpp index fbae84f..236fd2d 100644 --- a/bindings/cxx/tests/gpiod-cxx-test.cpp +++ b/bindings/cxx/tests/gpiod-cxx-test.cpp @@ -6,7 +6,7 @@ */ #define CATCH_CONFIG_MAIN -#include <catch.hpp> +#include <catch2/catch.hpp> #include <linux/version.h> #include <sys/utsname.h> #include <system_error> diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp index 276b533..11c2d4c 100644 --- a/bindings/cxx/tests/tests-chip.cpp +++ b/bindings/cxx/tests/tests-chip.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com> */ -#include <catch.hpp> +#include <catch2/catch.hpp> #include <gpiod.hpp> #include "gpio-mockup.hpp" diff --git a/bindings/cxx/tests/tests-event.cpp b/bindings/cxx/tests/tests-event.cpp index f93bb72..b34347f 100644 --- a/bindings/cxx/tests/tests-event.cpp +++ b/bindings/cxx/tests/tests-event.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com> */ -#include <catch.hpp> +#include <catch2/catch.hpp> #include <gpiod.hpp> #include <map> #include <poll.h> diff --git a/bindings/cxx/tests/tests-iter.cpp b/bindings/cxx/tests/tests-iter.cpp index 1af0256..fdc2cb5 100644 --- a/bindings/cxx/tests/tests-iter.cpp +++ b/bindings/cxx/tests/tests-iter.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com> */ -#include <catch.hpp> +#include <catch2/catch.hpp> #include <gpiod.hpp> #include "gpio-mockup.hpp" diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp index 2684bcb..e827e60 100644 --- a/bindings/cxx/tests/tests-line.cpp +++ b/bindings/cxx/tests/tests-line.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com> */ -#include <catch.hpp> +#include <catch2/catch.hpp> #include <gpiod.hpp> #include "gpio-mockup.hpp" diff --git a/configure.ac b/configure.ac index f72e13b..0459007 100644 --- a/configure.ac +++ b/configure.ac @@ -165,7 +165,7 @@ then if test "x$with_tests" = xtrue then AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS([catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch.hpp])]) + AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])]) AC_LANG_POP([C++]) fi fi
According to https://github.com/catchorg/Catch2/issues/1202 the regular include is 'catch2/catch.hpp' Also CMake and pkg-config provide include paths for this include name. Signed-off-by: Alexander Stein <alexander.stein@mailbox.org> --- bindings/cxx/tests/gpiod-cxx-test.cpp | 2 +- bindings/cxx/tests/tests-chip.cpp | 2 +- bindings/cxx/tests/tests-event.cpp | 2 +- bindings/cxx/tests/tests-iter.cpp | 2 +- bindings/cxx/tests/tests-line.cpp | 2 +- configure.ac | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)