From d9ea98eb2de96665725071ccee352c84e1bda5de Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Sun, 6 Jun 2021 22:42:27 -0400 Subject: [PATCH] tests: Make ImageWriter tests optional (#685) Just like the OpenCV tests require OpenCV, the ImageWriter tests require that ImageMagick be enabled in the build. If it isn't, skip those tests. --- tests/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f519856b1..55504a495 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -53,8 +53,6 @@ set(OPENSHOT_TESTS Color Coordinate DummyReader - ReaderBase - ImageWriter FFmpegReader FFmpegWriter Fraction @@ -63,14 +61,20 @@ set(OPENSHOT_TESTS KeyFrame Point QtImageReader + ReaderBase Settings Timeline ) -### -### OPENCV RELATED TEST FILES -### -if(ENABLE_OPENCV) +# ImageMagick related test files +if($CACHE{HAVE_IMAGEMAGICK}) + list(APPEND OPENSHOT_TESTS + ImageWriter + ) +endif() + +# OPENCV RELATED TEST FILES +if($CACHE{HAVE_OPENCV}) list(APPEND OPENSHOT_TESTS CVTracker CVStabilizer