diff options
| author | fuzzard <fuzzard@kodi.tv> | 2024-05-11 21:21:55 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2024-05-18 10:57:13 +1000 |
| commit | 48566d21fa533c5cfccb9aaba84e6edacf4bcec5 (patch) | |
| tree | efd387f4f61f3c61637f9ad4b0668c55e02c7989 | |
| parent | 20e359479dee17bc71e4c8f4b53dbf1dd0799351 (diff) | |
| download | xbmc-48566d21fa533c5cfccb9aaba84e6edacf4bcec5.tar.xz | |
[cmake][modules] FindAvahi cleanup and use core_target_link_libraries
| -rw-r--r-- | cmake/modules/FindAvahi.cmake | 44 | ||||
| -rw-r--r-- | xbmc/platform/linux/network/zeroconf/CMakeLists.txt | 2 |
2 files changed, 21 insertions, 25 deletions
diff --git a/cmake/modules/FindAvahi.cmake b/cmake/modules/FindAvahi.cmake index 6898217d14..3282678504 100644 --- a/cmake/modules/FindAvahi.cmake +++ b/cmake/modules/FindAvahi.cmake @@ -3,12 +3,12 @@ # --------- # Finds the avahi library # -# This will define the following target: +# This will define the following targets: # -# Avahi::Avahi - The avahi client library -# Avahi::AvahiCommon - The avahi common library +# ${APP_NAME_LC}::Avahi - The avahi client library +# ${APP_NAME_LC}::AvahiCommon - The avahi common library -if(NOT TARGET Avahi::Avahi) +if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME}) find_package(PkgConfig) if(PKG_CONFIG_FOUND) pkg_check_modules(PC_AVAHI avahi-client QUIET) @@ -16,20 +16,16 @@ if(NOT TARGET Avahi::Avahi) find_path(AVAHI_CLIENT_INCLUDE_DIR NAMES avahi-client/client.h HINTS ${DEPENDS_PATH}/include ${PC_AVAHI_INCLUDEDIR} - ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} - NO_CACHE) + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}) find_path(AVAHI_COMMON_INCLUDE_DIR NAMES avahi-common/defs.h HINTS ${DEPENDS_PATH}/include ${PC_AVAHI_INCLUDEDIR} - ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} - NO_CACHE) + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}) find_library(AVAHI_CLIENT_LIBRARY NAMES avahi-client HINTS ${DEPENDS_PATH}/lib ${PC_AVAHI_LIBDIR} - ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} - NO_CACHE) + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}) find_library(AVAHI_COMMON_LIBRARY NAMES avahi-common HINTS ${DEPENDS_PATH}/lib ${PC_AVAHI_LIBDIR} - ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} - NO_CACHE) + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}) set(AVAHI_VERSION ${PC_AVAHI_VERSION}) @@ -40,17 +36,17 @@ if(NOT TARGET Avahi::Avahi) VERSION_VAR AVAHI_VERSION) if(AVAHI_FOUND) - add_library(Avahi::AvahiCommon UNKNOWN IMPORTED) - set_target_properties(Avahi::AvahiCommon PROPERTIES - IMPORTED_LOCATION "${AVAHI_COMMON_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_COMMON_INCLUDE_DIR}" - INTERFACE_COMPILE_DEFINITIONS "HAS_AVAHI=1;HAS_ZEROCONF=1") - add_library(Avahi::Avahi UNKNOWN IMPORTED) - set_target_properties(Avahi::Avahi PROPERTIES - IMPORTED_LOCATION "${AVAHI_CLIENT_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_CLIENT_INCLUDE_DIR}" - INTERFACE_COMPILE_DEFINITIONS "HAS_AVAHI=1;HAS_ZEROCONF=1" - INTERFACE_LINK_LIBRARIES Avahi::AvahiCommon) - set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP Avahi::Avahi) + add_library(${APP_NAME_LC}::AvahiCommon UNKNOWN IMPORTED) + set_target_properties(${APP_NAME_LC}::AvahiCommon PROPERTIES + IMPORTED_LOCATION "${AVAHI_COMMON_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_COMMON_INCLUDE_DIR}" + INTERFACE_COMPILE_DEFINITIONS "HAS_AVAHI;HAS_ZEROCONF") + add_library(${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME} UNKNOWN IMPORTED) + set_target_properties(${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME} PROPERTIES + IMPORTED_LOCATION "${AVAHI_CLIENT_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_CLIENT_INCLUDE_DIR}" + INTERFACE_COMPILE_DEFINITIONS "HAS_AVAHI;HAS_ZEROCONF" + INTERFACE_LINK_LIBRARIES Avahi::AvahiCommon) + endif() endif() diff --git a/xbmc/platform/linux/network/zeroconf/CMakeLists.txt b/xbmc/platform/linux/network/zeroconf/CMakeLists.txt index 2ad37796e4..fb3ace7e89 100644 --- a/xbmc/platform/linux/network/zeroconf/CMakeLists.txt +++ b/xbmc/platform/linux/network/zeroconf/CMakeLists.txt @@ -1,4 +1,4 @@ -if(TARGET Avahi::Avahi) +if(TARGET ${APP_NAME_LC}::Avahi) set(SOURCES ZeroconfAvahi.cpp ZeroconfBrowserAvahi.cpp) set(HEADERS ZeroconfAvahi.h |