From 8655736e750f632698aea66ade1ae31de3aa6607 Mon Sep 17 00:00:00 2001 From: Dominic Radermacher Date: Mon, 13 Jan 2020 21:26:48 +0100 Subject: [PATCH] fix naming and try to fix compile errors related to config.h (generated by autotools) --- CMakeLists.txt | 16 ++++++++-------- src/libptouch.c | 2 +- src/ptouch-print.c | 3 ++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b4dfd9..819b26b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.15) -project(ptouch_print C) +project(ptouch-print C) # Configure CMake set(CMAKE_C_STANDARD 11) @@ -16,9 +16,9 @@ pkg_check_modules(LIBUSB REQUIRED libusb-1.0) execute_process(COMMAND bash "${CMAKE_CURRENT_LIST_DIR}/build-aux/git-version-gen" OUTPUT_VARIABLE VERSION) # Configure project executable -add_executable(ptouch_print) +add_executable(ptouch-print) -target_sources(ptouch_print +target_sources(ptouch-print PUBLIC include/ptouch.h PRIVATE @@ -28,7 +28,7 @@ target_sources(ptouch_print ) # Configure compiler -target_compile_options(ptouch_print +target_compile_options(ptouch-print PRIVATE -g -Wall @@ -38,7 +38,7 @@ target_compile_options(ptouch_print -fPIC ) -target_compile_definitions(ptouch_print +target_compile_definitions(ptouch-print PRIVATE LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" USING_CMAKE=1 @@ -47,7 +47,7 @@ target_compile_definitions(ptouch_print ) -target_include_directories(ptouch_print +target_include_directories(ptouch-print PRIVATE include ${GD_INCLUDE_DIR} @@ -55,7 +55,7 @@ target_include_directories(ptouch_print ) # Configure linker -target_link_libraries(ptouch_print +target_link_libraries(ptouch-print ${GD_LIBRARIES} ${LIBUSB_LIBRARIES} -) \ No newline at end of file +) diff --git a/src/libptouch.c b/src/libptouch.c index 6765a10..6a91ca9 100644 --- a/src/libptouch.c +++ b/src/libptouch.c @@ -26,7 +26,7 @@ #include /* open() */ #include /* open() */ #include /* nanosleep(), struct timespec */ -#include "config.h" +//#include "config.h" #include "gettext.h" /* gettext(), ngettext() */ #include "ptouch.h" diff --git a/src/ptouch-print.c b/src/ptouch-print.c index ebb634f..35f36e7 100644 --- a/src/ptouch-print.c +++ b/src/ptouch-print.c @@ -25,7 +25,8 @@ #include /* open() */ #include /* open() */ #include -#include "config.h" +//#include "config.h" +#include #include "gettext.h" /* gettext(), ngettext() */ #include "ptouch.h"