[Spice-devel] [PATCH] catch: directory is now catch2

[Christophe Fergeau]

On Tue, Jan 29, 2019 at 05:51:54PM +0200, Uri Lublin wrote:
> Upstream and since Fedora 27
> 
> Signed-off-by: Uri Lublin <uril at redhat.com>
> ---
> 
> Another option is to check both catch/ and catch2/
> and pick the one that is installed on the system, if any
> 
> ---
>  configure.ac                          | 4 ++--
>  src/unittests/test-mjpeg-fallback.cpp | 2 +-
>  src/unittests/test-stream-port.cpp    | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index c259f7e..321dea3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -119,9 +119,9 @@ case "$enable_tests" in
>    *) AC_MSG_ERROR([bad value ${enable_tests} for enable-tests option]) ;;
>  esac
>  AS_IF([test "x$enable_tests" != "xno"],
> -      [AC_CHECK_HEADER([catch/catch.hpp],have_check="yes",)])
> +      [AC_CHECK_HEADER([catch2/catch.hpp],have_check="yes",)])
>  AS_IF([test "x$enable_tests" = "xyes" && test "x$have_check" != "xyes"],
> -      [AC_MSG_ERROR([Could not find Catch dependency header (catch/catch.hpp)])])
> +      [AC_MSG_ERROR([Could not find Catch dependency header (catch2/catch.hpp)])])

catch2 ships a .pc file, it would be better to use this rather than
manually check for includes.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190130/f8c9e0ff/attachment.sig>