]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
fix build with include dir without links
authorBastian Dehn <hhaalo@arcor.de>
Sat, 14 Dec 2024 10:19:45 +0000 (11:19 +0100)
committerBastian Dehn <hhaalo@arcor.de>
Sat, 14 Dec 2024 10:19:45 +0000 (11:19 +0100)
readme.md
src/CMakeLists.txt

index 9d28ac6ecb2c539b2e173fb16b4b6c9e38230069..cefc5759e399afad68417abc969758d56ccf298c 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -50,9 +50,6 @@ You need to install dependencies (Debian 12 Bookworm)
 
 ```bash
 sudo apt-get install sane libsane-dev libconfuse-dev libcurl4-gnutls-dev libjson-c-dev libmagickcore-dev
-sudo ln -s /usr/include/ImageMagick-6/magick /usr/include/magick
-sudo mkdir /usr/include/magick/magick
-sudo ln -s /usr/include/x86_64-linux-gnu/ImageMagick-6/magick/magick-baseconfig.h /usr/include/magick/magick-baseconfig.h
 ```
 Build Package
 
index f51b4d2951e99ff69a430908fbb6da18b6356e59..63dfc1d2ee3f37e1ff0fa5fc44fa7d6e3d4ba703 100644 (file)
@@ -62,7 +62,11 @@ SET(SOURCES
 
 ADD_LIBRARY("sane-kds_s2000w_net" SHARED ${SOURCES})
 SET_TARGET_PROPERTIES("sane-kds_s2000w_net" PROPERTIES VERSION 1)
-TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net"
+       PRIVATE
+       ${CMAKE_CURRENT_BINARY_DIR}
+       /usr/include/ImageMagick-6
+       /usr/include/x86_64-linux-gnu/ImageMagick-6)
 TARGET_LINK_LIBRARIES("sane-kds_s2000w_net"
        ${MATH}
        ${PTHREAD}
@@ -76,7 +80,11 @@ ADD_LIBRARY("sane-kds_s2000w_net-static"
        ${SOURCES}
        ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 SET_TARGET_PROPERTIES("sane-kds_s2000w_net-static" PROPERTIES OUTPUT_NAME "sane-kds_s2000w_net")
-TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net-static" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+TARGET_INCLUDE_DIRECTORIES("sane-kds_s2000w_net-static"
+       PRIVATE
+       ${CMAKE_CURRENT_BINARY_DIR}
+       /usr/include/ImageMagick-6
+       /usr/include/x86_64-linux-gnu/ImageMagick-6)
 TARGET_LINK_LIBRARIES("sane-kds_s2000w_net-static"
        ${MATH}
        ${PTHREAD}