From b6f24fbb1ec41280d205fca227bff8a45231291a Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 9 Mar 2024 07:31:15 +0100 Subject: [PATCH] change config file with cmake variable --- src/CMakeLists.txt | 6 ++++-- src/config.h.in | 3 ++- src/kds_s2000w_client.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1de7846..c61ae94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,8 +19,10 @@ cmake_path(GET SANE PARENT_PATH SANE_LIBRARY_PATH) message(STATUS "SANE_LIBRARY_PATH: " ${SANE_LIBRARY_PATH}) set(SANE_LIBRARY_BACKEND_PATH ${SANE_LIBRARY_PATH}/sane CACHE STRING "sane library backend path") message(STATUS "SANE_LIBRARY_BACKEND_PATH: " ${SANE_LIBRARY_BACKEND_PATH}) -set(SANE_CONFIG_PATH "/etc/sane.d/" CACHE STRING "config path") +set(SANE_CONFIG_PATH "/etc/sane.d" CACHE STRING "config path") message(STATUS "SANE_CONFIG_PATH: " ${SANE_CONFIG_PATH}) +set(CONFIG_FILE ${SANE_CONFIG_PATH}/kds_s2000w_net.conf CACHE STRING "sane kds-s2000w-net config path") +message(STATUS "CONFIG_FILE: " ${CONFIG_FILE}) configure_file(config.h.in config.h) @@ -47,7 +49,7 @@ target_link_libraries("sane-kds_s2000w_net" install(TARGETS "sane-kds_s2000w_net" DESTINATION ${SANE_LIBRARY_BACKEND_PATH}) -if (NOT EXISTS "${SANE_CONFIG_PATH}/kds_s2000w_net.conf") +if (NOT EXISTS ${SANE_CONFIG_PATH}) install(FILES "kds_s2000w_net.conf" DESTINATION ${SANE_CONFIG_PATH}) endif() \ No newline at end of file diff --git a/src/config.h.in b/src/config.h.in index 0c67101..d65590e 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,3 +1,4 @@ #define MAJOR @PROJECT_VERSION_MAJOR@ #define MINOR @PROJECT_VERSION_MINOR@ -#define PATCH @PROJECT_VERSION_PATCH@ \ No newline at end of file +#define PATCH @PROJECT_VERSION_PATCH@ +#define CONFIG_FILE "@CONFIG_FILE@" \ No newline at end of file diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index d8b74d2..ef189e1 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -1,6 +1,7 @@ #include #include #include +#include "config.h" #include "kds_s2000w_client.h" #include "kds_s2000w_debug.h" #include "kds_s2000w_config.h" @@ -9,7 +10,7 @@ program_config p_config; void _kds_s2000w_client_load_config() { - const char* config_file = "/etc/sane.d/kds_s2000w_net.conf"; + const char* config_file = CONFIG_FILE; char* config_stream = read_config_file(config_file); load_config(&p_config, config_stream); } -- 2.39.5