From 2f28fa47eaa110934acaa17367fb08b9875dc9fc Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 14 Dec 2024 11:19:45 +0100 Subject: [PATCH] fix build with include dir without links --- readme.md | 3 --- src/CMakeLists.txt | 12 ++++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 9d28ac6..cefc575 100644 --- 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f51b4d2..63dfc1d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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} -- 2.39.5