Add common tde_setup_dbus macro #22
Слито
SlavekB
слито 1 коммит(ов) из feat/add-test-dbus в master 5 лет назад
Нет рецензентов
Нет меток
Нет назначенных лиц
2 участников
Уведомления
Срок выполнения
Срок выполнения не установлен.
Зависимости
Зависимостей нет.
Reference: TDE/tde-cmake#22
Загрузка…
Ссылка в новой задаче
Пока нет содержимого.
Удалить ветку 'feat/add-test-dbus'
Удаление ветки НЕОБРАТИМО. Действие никак нельзя отменить.
The macro is primarily used for modules that create some D-Bus services.
It can be called without a parameter – only dbus-1 will be tested and the paths to the dbus files will be searched. Alternatively, the name of the TQt dbus module – usually dbus-1-tqt – can be entered as a parameter. If the parameter is entered, the TQt dbus module will also be tested.
Note: Macro in this form can also be used for the R14.0.x branch.
Great work, just need to fix the two points I mentioned
if( NOT "${ARGV}" STREQUAL "" AND NOT DBUS_TQT_FOUND )pkg_search_module( DBUS_TQT ${ARGV} )if( NOT DBUS_FOUND )Should be:
The macro is ready to allow two ways to call:
Therefore, there is a condition if the argument was or was not entered.
Now I understand - the mistake fixed.
if( NOT DBUS_FOUND )tde_message_fatal( "${ARGV} is required, but not found on your system" )endif( )if( "${ARGV}" STREQUAL "dbus-1-tqt" )Only check if dbus-1-tqt was found
Here are two independent conditions. If an argument was entered, but the requested module was not found then here is
tde_message_fatal.A separate condition is if the required module was dbus-1-tqt, then the path to the binary will be searched.
Therefore, it seems to me appropriate not to mix these conditions into one.
LGTM 👍
Related to issue #20
ac342e63c6.