diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-01-12 15:45:34 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 17:43:47 +0100 |
| commit | 46ecddaeff61d59828cccd16cd01bb407bf17f4d (patch) | |
| tree | 6ca2e5403606dd96af44065748cddc55b2778781 /CMakeLists.txt | |
| parent | a9bf4396088c2cc598e65654ae009c5e175db742 (diff) | |
| download | tdelibs-46ecddaeff61d59828cccd16cd01bb407bf17f4d.tar.gz tdelibs-46ecddaeff61d59828cccd16cd01bb407bf17f4d.zip | |
Fix building with avahi support
+ Avahi detection was not performed at all
+ Added missing avahi-client detection
+ Fixed FTBFS in avahi related code
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 281e2da7f14eca57104dbd3f7da39506011729a8)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8763e250a..5df0028c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -998,16 +998,15 @@ endif( WITH_LUA ) ##### check for avahi ########################### if( WITH_AVAHI ) - if( WITH_QT4 ) - endif( WITH_QT4 ) - - if( WITH_QT3 ) - pkg_search_module( AVAHI avahi-tqt ) - if( NOT AVAHI_FOUND ) - message(FATAL_ERROR "\navahi support are requested, but not found on your system" ) - endif( NOT AVAHI_FOUND ) - set( AVAHI_API_0_6 1 ) - endif( WITH_QT3 ) + pkg_search_module( AVAHI_TQT avahi-tqt ) + pkg_search_module( AVAHI_CLIENT avahi-client ) + if( NOT AVAHI_TQT_FOUND OR NOT AVAHI_CLIENT_FOUND ) + tde_message_fatal( "avahi support is requested, but not found on your system" ) + endif( NOT AVAHI_TQT_FOUND OR NOT AVAHI_CLIENT_FOUND ) + if( NOT AVAHI_CLIENT_VERSION VERSION_LESS "0.6" ) + set( AVAHI_API_0_6 1 ) + endif( ) + set( HAVE_DNSSD 1 ) endif( ) ##### check for pcre ########################### |