zeroconf on by default, compiler error on x86 (#705)
* zeroconf on by default dynamic link zeroconf by default * revert zerconf to now default to off * formatting
This commit is contained in:
parent
592c5fcd44
commit
2beb36ecdc
|
@ -18,6 +18,7 @@ SET ( DEFAULT_SPIDEV OFF )
|
|||
SET ( DEFAULT_WS2812BPWM OFF )
|
||||
SET ( DEFAULT_WS281XPWM OFF )
|
||||
SET ( DEFAULT_ZEROCONF OFF )
|
||||
SET ( DEFAULT_USE_SHARED_AVAHI_LIBS OFF )
|
||||
|
||||
if (APPLE)
|
||||
SET ( DEFAULT_OSX ON )
|
||||
|
@ -36,6 +37,7 @@ else ()
|
|||
elseif ( "${PLATFORM}" STREQUAL "x86" )
|
||||
SET ( DEFAULT_X11 ON )
|
||||
SET ( DEFAULT_FB ON )
|
||||
SET ( DEFAULT_USE_SHARED_AVAHI_LIBS ON )
|
||||
elseif ( "${PLATFORM}" STREQUAL "imx6" )
|
||||
SET ( DEFAULT_FB ON )
|
||||
endif()
|
||||
|
|
|
@ -41,12 +41,26 @@ qt5_use_modules(bonjour Widgets Network)
|
|||
endif(ENABLE_QT5)
|
||||
|
||||
target_link_libraries(bonjour
|
||||
hyperion
|
||||
hyperion-utils
|
||||
${QT_LIBRARIES})
|
||||
|
||||
set(USE_SHARED_AVAHI_LIBS ${DEFAULT_USE_SHARED_AVAHI_LIBS} CACHE BOOL "use avahi libraries from system")
|
||||
|
||||
if (USE_SHARED_AVAHI_LIBS)
|
||||
target_link_libraries(bonjour
|
||||
dns_sd
|
||||
avahi-client
|
||||
avahi-common
|
||||
avahi-core
|
||||
# avahi-qt4
|
||||
dbus-1)
|
||||
else ()
|
||||
target_link_libraries(bonjour
|
||||
libdns_sd.a
|
||||
libavahi-client.a
|
||||
libavahi-common.a
|
||||
libavahi-core.a
|
||||
libavahi-qt4.a
|
||||
libdbus-1.a
|
||||
hyperion
|
||||
hyperion-utils
|
||||
${QT_LIBRARIES})
|
||||
# libavahi-qt4.a
|
||||
libdbus-1.a)
|
||||
endif ()
|
||||
|
|
Loading…
Reference in New Issue