diff --git a/meson.build b/meson.build index 131fb4e..48dbf36 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,7 @@ project('ptprnt', 'cpp', usb_dep = dependency('libusb-1.0') log_dep = dependency('spdlog') pangocairo_dep = dependency('pangocairo') +cli11_dep = dependency('CLI11') incdir = include_directories('src') @@ -38,24 +39,18 @@ ptprnt_srcs = [ ptprnt_lib = library('ptprnt', include_directories: incdir, install: true, - dependencies: [usb_dep, log_dep, pangocairo_dep], + dependencies: [usb_dep, log_dep, pangocairo_dep, cli11_dep], sources: [ptprnt_hpps, ptprnt_srcs]) ptprnt_dep = declare_dependency(include_directories: incdir, link_with: ptprnt_lib) -# CLI11 -cli11_proj = subproject('cli11') -cli11_dep = cli11_proj.get_variable('CLI11_dep') -if not cli11_dep.found() - error('CLI11 not found, can not proceed') -endif ptprnt_exe = executable( 'ptprnt', 'src/main.cpp', install: true, - dependencies : [usb_dep, log_dep, ptprnt_dep, cli11_dep], + dependencies : [usb_dep, log_dep, cli11_dep, ptprnt_dep], cpp_args : ['-DPROJ_VERSION="'+meson.project_version()+'"'], ) diff --git a/src/main.cpp b/src/main.cpp index 3a57c4d..e57eb15 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,6 @@ */ -#include #include #include