Fixed CI recipe, confirmed support for Catch < 2
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
3c879d6eb4
commit
a72149221a
|
@ -43,7 +43,7 @@ pipeline:
|
||||||
- rm -rf build && mkdir -p build && cd build
|
- rm -rf build && mkdir -p build && cd build
|
||||||
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTS=1 ..
|
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTS=1 ..
|
||||||
- make VERBOSE=1
|
- make VERBOSE=1
|
||||||
- for test in test_*; do ${test}; done
|
- ctest ..
|
||||||
- make install DESTDIR=install
|
- make install DESTDIR=install
|
||||||
- make package
|
- make package
|
||||||
- cmake -DWITH_DEB=ON ..
|
- cmake -DWITH_DEB=ON ..
|
||||||
|
|
|
@ -80,7 +80,7 @@ They are generated on Debian Stretch 64 bit and signed with my
|
||||||
* [cmake](https://cmake.org/) (at least 3.2)
|
* [cmake](https://cmake.org/) (at least 3.2)
|
||||||
* [imagemagick](https://www.imagemagick.org/) (tested: 7.0 / 6.7)
|
* [imagemagick](https://www.imagemagick.org/) (tested: 7.0 / 6.7)
|
||||||
* Optional:
|
* 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:
|
On a Debian system, install the packages:
|
||||||
`build-essential cmake libmagick++-dev`.
|
`build-essential cmake libmagick++-dev`.
|
||||||
|
|
|
@ -3,6 +3,7 @@ if(WITH_TESTS)
|
||||||
if(Catch2_FOUND)
|
if(Catch2_FOUND)
|
||||||
set(MYCATCH, Catch2::Catch2)
|
set(MYCATCH, Catch2::Catch2)
|
||||||
else()
|
else()
|
||||||
|
message(WARNING "Catch2 not found. Assuming Catch 1.x is installed.")
|
||||||
set(MYCATCH, "")
|
set(MYCATCH, "")
|
||||||
endif()
|
endif()
|
||||||
include(CTest)
|
include(CTest)
|
||||||
|
|
Loading…
Reference in New Issue