From: Bastian Dehn Date: Sat, 1 Feb 2025 15:11:52 +0000 (+0100) Subject: change imagemagick default off X-Git-Tag: v1.0.29^2~3^2~3 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=32646ed2cfc3c399f3653ad80a96938a5ea45872;p=sane-kds-s2000w-net.git change imagemagick default off --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b29abff..8287958 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,8 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.25.1) PROJECT("sane-kds-s2000w-net" VERSION "1.0.28") -OPTION(WITHOUT_IMAGEMAGICK "without ImageMagick library" OFF) -MESSAGE(STATUS "WITHOUT_IMAGEMAGICK: " ${WITHOUT_IMAGEMAGICK}) +OPTION(IMAGEMAGICK "without ImageMagick library" OFF) +MESSAGE(STATUS "IMAGEMAGICK: " ${IMAGEMAGICK}) FIND_PACKAGE(Git) IF(GIT_FOUND) @@ -35,7 +35,7 @@ MESSAGE(STATUS "find curl: " ${CURL_LIBRARY}) FIND_PACKAGE(JSON-C REQUIRED) MESSAGE(STATUS "find json-c: " ${JSON\-C_DIR}) -IF(NOT WITHOUT_IMAGEMAGICK) +IF(IMAGEMAGICK) FIND_PACKAGE(ImageMagick COMPONENTS MagickCore REQUIRED) MESSAGE(STATUS "find ImageMagick: " ${ImageMagick_LIBRARIES}) MESSAGE(STATUS "ImageMagick_VERSION_STRING: " ${ImageMagick_VERSION_STRING}) @@ -81,7 +81,7 @@ SET(SOURCES "kds_s2000w_heartbeat.c" "kds_s2000w_image_type_check.c") -IF(NOT WITHOUT_IMAGEMAGICK) +IF(IMAGEMAGICK) LIST(APPEND SOURCES "kds_s2000w_image_converter_magick.c") ELSE() LIST(APPEND SOURCES "kds_s2000w_image_converter_netpbm.c") @@ -99,7 +99,7 @@ TARGET_LINK_LIBRARIES("sane-kds_s2000w_net" ${CURL_LIBRARY} json-c) -IF(NOT WITHOUT_IMAGEMAGICK) +IF(IMAGEMAGICK) TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net" PRIVATE ${ImageMagick_INCLUDE_DIRS}) @@ -127,7 +127,7 @@ TARGET_LINK_LIBRARIES("sane-kds_s2000w_net-static" ${CURL_LIBRARY} json-c) -IF(NOT WITHOUT_IMAGEMAGICK) +IF(IMAGEMAGICK) TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net-static" PRIVATE ${ImageMagick_INCLUDE_DIRS})