From: Bastian Dehn Date: Sat, 14 Dec 2024 12:25:10 +0000 (+0100) Subject: change build fix image magick version X-Git-Tag: v1.0.7^2~6 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=ff9853f77fe342b14f84a03dae2683b5ec38afa3;p=sane-kds-s2000w-net.git change build fix image magick version --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b6d56d0..f321a92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,8 +33,9 @@ FIND_PACKAGE(JSON-C REQUIRED) MESSAGE(STATUS "find json-c: " ${JSON\-C_DIR}) FIND_PACKAGE(ImageMagick COMPONENTS MagickCore REQUIRED) MESSAGE(STATUS "find ImageMagick: " ${ImageMagick_LIBRARIES}) -STRING(SUBSTRING ${ImageMagick_VERSION_STRING} 0 1 ImageMagick_MAJOR_VERSION) -ADD_COMPILE_DEFINITIONS(IMAGE_MAGICK_MAJOR=${ImageMagick_MAJOR_VERSION}) +SET(IMAGE_MAGICK_MAJOR 6) +MESSAGE(STATUS "define IMAGE_MAGICK_MAJOR: " ${IMAGE_MAGICK_MAJOR}) +ADD_COMPILE_DEFINITIONS(IMAGE_MAGICK_MAJOR=${IMAGE_MAGICK_MAJOR}) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/" CACHE PATH "install prefix" FORCE)