From a72149221af5c65f1600d2bcc779b6b14a6681ca Mon Sep 17 00:00:00 2001 From: tastytea Date: Wed, 2 Jan 2019 06:18:36 +0100 Subject: [PATCH] Fixed CI recipe, confirmed support for Catch < 2 --- .drone.yml | 2 +- README.md | 2 +- tests.CMakeLists.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f342fd2..ea4f843 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ pipeline: - rm -rf build && mkdir -p build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTS=1 .. - make VERBOSE=1 - - for test in test_*; do ${test}; done + - ctest .. - make install DESTDIR=install - make package - cmake -DWITH_DEB=ON .. diff --git a/README.md b/README.md index e63d3ca..14ce6ab 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ They are generated on Debian Stretch 64 bit and signed with my * [cmake](https://cmake.org/) (at least 3.2) * [imagemagick](https://www.imagemagick.org/) (tested: 7.0 / 6.7) * Optional: - * [Catch](https://github.com/catchorg/Catch2) (tested: 2.3.0) + * [Catch](https://github.com/catchorg/Catch2) (tested: 2.3 / 1.2) On a Debian system, install the packages: `build-essential cmake libmagick++-dev`. diff --git a/tests.CMakeLists.txt b/tests.CMakeLists.txt index 09ef4c5..5e4fde4 100644 --- a/tests.CMakeLists.txt +++ b/tests.CMakeLists.txt @@ -3,6 +3,7 @@ if(WITH_TESTS) if(Catch2_FOUND) set(MYCATCH, Catch2::Catch2) else() + message(WARNING "Catch2 not found. Assuming Catch 1.x is installed.") set(MYCATCH, "") endif() include(CTest)