Merge pull request #399 from analogdevicesinc/rgetz-fix-avahi

Cmake: restore installing the Avahi service file
analogdevicesinc · Mar 16, 2020 · 9c4a410 · 9c4a410
2 parents 7d13885 + 9501cb9
commit 9c4a410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -265,6 +265,7 @@ if(WITH_NETWORK_BACKEND)
 	elseif(AVAHI_CLIENT_LIBRARIES AND AVAHI_COMMON_LIBRARIES)
 		message(STATUS "Building with Avahi, a DNS SD implementation")
 		set(HAVE_DNS_SD ON)
+		set(HAVE_AVAHI ON)
 
 		list(APPEND LIBIIO_CFILES dns_sd_avahi.c)
 		set(AVAHI_LIBRARIES ${AVAHI_CLIENT_LIBRARIES} ${AVAHI_COMMON_LIBRARIES})
@@ -274,10 +275,6 @@ if(WITH_NETWORK_BACKEND)
 		message(STATUS "Building without DNS-SD (Zeroconf) support")
 	endif()
 
-	if (HAVE_DNS_SD)
-		add_definitions(-DHAVE_DNS_SD=1)
-	endif()
-
 	set(NEED_THREADS 1)
 	set(IIOD_CLIENT 1)
 	set(NEED_LIBXML2 1)

diff --git a/iio-config.h.cmakein b/iio-config.h.cmakein
@@ -24,6 +24,7 @@
 #cmakedefine HAS_NEWLOCALE
 #cmakedefine HAS_PTHREAD_SETNAME_NP
 #cmakedefine HAVE_IPV6
+#cmakedefine HAVE_DNS_SD
 #cmakedefine HAVE_AVAHI
 #cmakedefine NO_THREADS
 #cmakedefine HAS_LIBUSB_GETVERSION