Skip to content

Commit 64962a8

Browse files
authored
Merge pull request #378 from PixlOne/remove-dbus-check
Remove check if DBus is found
2 parents 30ade71 + b4a9d44 commit 64962a8

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/logid/CMakeLists.txt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ add_executable(logid
7272
set_target_properties(logid PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
7373

7474
pkg_check_modules(PC_EVDEV libevdev REQUIRED)
75-
pkg_check_modules(DBUS "dbus-1")
7675
pkg_check_modules(SYSTEMD "systemd")
7776
pkg_check_modules(LIBCONFIG libconfig REQUIRED)
7877
pkg_check_modules(LIBUDEV libudev REQUIRED)
@@ -111,13 +110,11 @@ elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
111110
message(FATAL_ERROR "systemd is not found w/ pkg-config but SYSTEMD_SERVICES_INSTALL_DIR is defined.")
112111
endif ()
113112

114-
if(DBUS_FOUND)
115-
# Install DBus conf
116-
# TODO: Is there a better way of setting the system policy directory?
117-
set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
118-
configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf)
119-
message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}")
120-
install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf
121-
DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR}
122-
COMPONENT cp)
123-
endif()
113+
# Install DBus conf
114+
# TODO: Is there a better way of setting the system policy directory?
115+
set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d")
116+
configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf)
117+
message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}")
118+
install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf
119+
DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR}
120+
COMPONENT cp)

0 commit comments

Comments
 (0)