From d32524e211f7af301845b5db518d818b77831205 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Tue, 6 Sep 2022 03:21:41 +0200 Subject: Rewrite to indicator-ng: Code and build changes --- src/CMakeLists.txt | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 98af322..44e276a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,31 +1,22 @@ -# libayatana-printersmenu.so -add_library (ayatana-printersmenu SHARED - indicator-printers.c - indicator-printers.h - indicator-menu-item.c - indicator-menu-item.h - dbus-names.h) -target_include_directories (ayatana-printersmenu PUBLIC ${SERVICE_INCLUDE_DIRS}) -target_compile_definitions (ayatana-printersmenu PUBLIC GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" PACKAGE_NAME="${PACKAGE}") -install (TARGETS ayatana-printersmenu DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/ayatana-indicators3/7/") - # cups-notifier.h # cups-notifier.c include (GdbusCodegen) add_gdbus_codegen_with_namespace (CUPS_NOTIFIER cups-notifier org.cups.cupsd Cups "${CMAKE_CURRENT_SOURCE_DIR}/org.cups.cupsd.Notifier.xml") -# ayatana-indicator-printers-service -add_executable (ayatana-indicator-printers-service +# libayatanaindicatorprinterssservice.a +add_library (ayatanaindicatorprinterssservice STATIC + indicator-printers-service.h indicator-printers-service.c - indicator-printers-menu.c - indicator-printers-menu.h indicator-printer-state-notifier.c indicator-printer-state-notifier.h spawn-printer-settings.c spawn-printer-settings.h dbus-names.h ${CUPS_NOTIFIER}) -target_include_directories (ayatana-indicator-printers-service PUBLIC ${SERVICE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries (ayatana-indicator-printers-service ${SERVICE_LIBRARIES}) -target_compile_definitions (ayatana-indicator-printers-service PUBLIC GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") +target_include_directories (ayatanaindicatorprinterssservice PUBLIC ${SERVICE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) +target_compile_definitions (ayatanaindicatorprinterssservice PUBLIC GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") + +# ayatana-indicator-printers-service +add_executable (ayatana-indicator-printers-service main.c) +target_link_libraries (ayatana-indicator-printers-service ayatanaindicatorprinterssservice ${SERVICE_LIBRARIES}) install (TARGETS ayatana-indicator-printers-service RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}) -- cgit v1.2.3 From 0c689d5662beef6b90a0104ab3933058f23ce7f9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 21 Sep 2022 23:56:03 +0200 Subject: CMake: Typo fix in target name. --- src/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44e276a..d0fdbd1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,8 +3,8 @@ include (GdbusCodegen) add_gdbus_codegen_with_namespace (CUPS_NOTIFIER cups-notifier org.cups.cupsd Cups "${CMAKE_CURRENT_SOURCE_DIR}/org.cups.cupsd.Notifier.xml") -# libayatanaindicatorprinterssservice.a -add_library (ayatanaindicatorprinterssservice STATIC +# libayatanaindicatorprintersservice.a +add_library (ayatanaindicatorprintersservice STATIC indicator-printers-service.h indicator-printers-service.c indicator-printer-state-notifier.c @@ -13,10 +13,10 @@ add_library (ayatanaindicatorprinterssservice STATIC spawn-printer-settings.h dbus-names.h ${CUPS_NOTIFIER}) -target_include_directories (ayatanaindicatorprinterssservice PUBLIC ${SERVICE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) -target_compile_definitions (ayatanaindicatorprinterssservice PUBLIC GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") +target_include_directories (ayatanaindicatorprintersservice PUBLIC ${SERVICE_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) +target_compile_definitions (ayatanaindicatorprintersservice PUBLIC GETTEXT_PACKAGE="${GETTEXT_PACKAGE}" LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") # ayatana-indicator-printers-service add_executable (ayatana-indicator-printers-service main.c) -target_link_libraries (ayatana-indicator-printers-service ayatanaindicatorprinterssservice ${SERVICE_LIBRARIES}) +target_link_libraries (ayatana-indicator-printers-service ayatanaindicatorprintersservice ${SERVICE_LIBRARIES}) install (TARGETS ayatana-indicator-printers-service RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}) -- cgit v1.2.3