diff options
| -rw-r--r-- | CMakeLists.txt | 27 | ||||
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | README.md (renamed from README) | 4 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | data/org.freedesktop.timedate1.conf (renamed from org.freedesktop.timedate1.conf) | 0 | ||||
| -rw-r--r-- | data/org.freedesktop.timedate1.policy (renamed from org.freedesktop.timedate1.policy) | 0 | ||||
| -rw-r--r-- | data/org.freedesktop.timedate1.service.in (renamed from org.freedesktop.timedate1.service.in) | 0 | ||||
| -rw-r--r-- | data/org.freedesktop.timedate1.xml (renamed from org.freedesktop.timedate1.xml) | 0 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/slack-timedate.cpp (renamed from slack-timedate.cpp) | 0 | ||||
| -rw-r--r-- | src/slack-timedate.h (renamed from slack-timedate.h) | 0 |
11 files changed, 30 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 304a366..ae5077d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,28 +6,5 @@ include(GNUInstallDirs) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) set(CMAKE_CXX_STANDARD 17) -find_package(PkgConfig) -pkg_check_modules(GDBUS REQUIRED gio-2.0 dbus-1 glibmm-2.4) -find_program(SED sed) - -add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service - COMMAND ${SED} -e s|@LIBEXECDIR@|${CMAKE_INSTALL_FULL_LIBEXECDIR}| ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.timedate1.service.in > ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service - MAIN_DEPENDENCY org.freedesktop.timedate1.service.in - VERBATIM) -add_custom_target(service ALL DEPENDS ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service) - -add_executable(slack-timedate - slack-timedate.cpp slack-timedate.h -) -target_include_directories(slack-timedate PRIVATE ${GDBUS_INCLUDE_DIRS}) -target_link_libraries(slack-timedate ${GDBUS_LIBRARIES}) - -install(TARGETS slack-timedate DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) -install(FILES org.freedesktop.timedate1.xml - DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces) -install(FILES org.freedesktop.timedate1.policy - DESTINATION ${CMAKE_INSTALL_DATADIR}/polkit-1/actions) -install(FILES org.freedesktop.timedate1.conf - DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d) -install(FILES ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service - DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services) +add_subdirectory(data) +add_subdirectory(src) diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index a60d8ae..0000000 --- a/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2024-04-07 Eugen Wissner <belka@caraus.de> - - * Added PolicyKit configuration - -==================== 1.1 ==================== - -2012-01-22 Eugen Wissner <belka@caraus.de> - - * Added autotools scripts @@ -8,7 +8,7 @@ init-system. ## Installation -``` +```sh cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_SYSCONFDIR=/etc @@ -20,7 +20,7 @@ The installation will create a file `build/install_manifest.txt`, which contains a list of all files installed in the system. To uninstall the application those should be removed, for example by doing: -``` +```sh xargs rm < build/install_manifest.txt ``` diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..93c1f77 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,16 @@ +find_program(SED sed) + +add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service + COMMAND ${SED} -e s|@LIBEXECDIR@|${CMAKE_INSTALL_FULL_LIBEXECDIR}| ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.timedate1.service.in > ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service + MAIN_DEPENDENCY org.freedesktop.timedate1.service.in + VERBATIM) +add_custom_target(service ALL DEPENDS ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service) + +install(FILES org.freedesktop.timedate1.xml + DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces) +install(FILES org.freedesktop.timedate1.policy + DESTINATION ${CMAKE_INSTALL_DATADIR}/polkit-1/actions) +install(FILES org.freedesktop.timedate1.conf + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d) +install(FILES ${PROJECT_BINARY_DIR}/org.freedesktop.timedate1.service + DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services) diff --git a/org.freedesktop.timedate1.conf b/data/org.freedesktop.timedate1.conf index 36557d5..36557d5 100644 --- a/org.freedesktop.timedate1.conf +++ b/data/org.freedesktop.timedate1.conf diff --git a/org.freedesktop.timedate1.policy b/data/org.freedesktop.timedate1.policy index a3b1dc5..a3b1dc5 100644 --- a/org.freedesktop.timedate1.policy +++ b/data/org.freedesktop.timedate1.policy diff --git a/org.freedesktop.timedate1.service.in b/data/org.freedesktop.timedate1.service.in index 1849390..1849390 100644 --- a/org.freedesktop.timedate1.service.in +++ b/data/org.freedesktop.timedate1.service.in diff --git a/org.freedesktop.timedate1.xml b/data/org.freedesktop.timedate1.xml index b035d10..b035d10 100644 --- a/org.freedesktop.timedate1.xml +++ b/data/org.freedesktop.timedate1.xml diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..9dc53d4 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,10 @@ +find_package(PkgConfig) +pkg_check_modules(GDBUS REQUIRED gio-2.0 dbus-1 glibmm-2.4) + +add_executable(slack-timedate + slack-timedate.cpp slack-timedate.h +) +target_include_directories(slack-timedate PRIVATE ${GDBUS_INCLUDE_DIRS}) +target_link_libraries(slack-timedate ${GDBUS_LIBRARIES}) + +install(TARGETS slack-timedate DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) diff --git a/slack-timedate.cpp b/src/slack-timedate.cpp index 3f8b2d8..3f8b2d8 100644 --- a/slack-timedate.cpp +++ b/src/slack-timedate.cpp diff --git a/slack-timedate.h b/src/slack-timedate.h index 7154336..7154336 100644 --- a/slack-timedate.h +++ b/src/slack-timedate.h |