From 8244fab5421fd14d4c75ce488ad18d38b7a6edb4 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Thu, 25 Jun 2020 12:21:50 +0200 Subject: [PATCH 2/2] CMake: only add turbojpeg test if configured WITH_JPEG Closes #430 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 290deb38..fdca4d81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -682,9 +682,9 @@ add_test(NAME cargs COMMAND test_cargstest) if(UNIX) add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) endif(UNIX) -if(FOUND_LIBJPEG_TURBO) +if(WITH_JPEG AND FOUND_LIBJPEG_TURBO) add_test(NAME turbojpeg COMMAND test_tjunittest) -endif(FOUND_LIBJPEG_TURBO) +endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO) if(LIBVNCSERVER_WITH_WEBSOCKETS) add_test(NAME wstest COMMAND test_wstest) endif(LIBVNCSERVER_WITH_WEBSOCKETS) -- 2.26.2