Add common tde_setup_dbus macro #22

병합
SlavekB feat/add-test-dbus 에서 master 로 1 commits 를 머지했습니다 5 년 전
SlavekB 코멘트됨, 5 년 전
소유자

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.

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.
SlavekB added the PR/rfc label 5 년 전
MicheleC 이 변경사항을 승인하였습니다. 5 년 전
MicheleC left a comment
소유자

Great work, just need to fix the two points I mentioned

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 )
MicheleC 코멘트됨, 5 년 전
소유자

Should be:

if( NOT DBUS_TQT_FOUND )
Should be: ``` if( NOT DBUS_TQT_FOUND ) ```
SlavekB 코멘트됨, 5 년 전
포스터
소유자

The macro is ready to allow two ways to call:

  1. without argument:
tde_setup_dbus( )
  1. with argument:
tde_setup_dbus( dbus-1-tqt )

Therefore, there is a condition if the argument was or was not entered.

The macro is ready to allow two ways to call: 1. without argument: ``` tde_setup_dbus( ) ``` 2. with argument: ``` tde_setup_dbus( dbus-1-tqt ) ``` Therefore, there is a condition if the argument was or was not entered.
SlavekB 코멘트됨, 5 년 전
포스터
소유자

Now I understand - the mistake fixed.

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" )
MicheleC 코멘트됨, 5 년 전
소유자

Only check if dbus-1-tqt was found

if( DBUS_TQT_FOUND AND "${ARGV}" STREQUAL "dbus-1-tqt" )
Only check if dbus-1-tqt was found ``` if( DBUS_TQT_FOUND AND "${ARGV}" STREQUAL "dbus-1-tqt" ) ```
SlavekB 코멘트됨, 5 년 전
포스터
소유자

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.

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.
MicheleC 이 변경사항을 승인하였습니다. 5 년 전
MicheleC left a comment
소유자

LGTM 👍

LGTM :+1:
SlavekB removed the PR/rfc label 5 년 전
MicheleC 코멘트됨, 5 년 전
소유자

Related to issue #20

Related to issue #20
MicheleC R14.0.6 release 5 년 전 마일스톤을 추가하였습니다.
SlavekB closed this pull request 5 년 전
SlavekB 삭제된 브랜치 feat/add-test-dbus 5 년 전
The pull request has been merged as ac342e63c6.
로그인하여 이 대화에 참여
No reviewers
마일스톤 없음
담당자 없음
참여자 2명
알림
마감일

마감일이 설정되지 않았습니다.

의존성

No dependencies set.

Reference: TDE/tde-cmake#22
불러오는 중...
아직 콘텐츠가 없습니다.