New upstream version 2.1.2+dfsgupstream/2.1.2+dfsg

1 files changed, 32 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c4ba6d..f6f6aa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,7 @@ if (UNIX)
     include (CheckIncludeFileCXX)
     include (CheckSymbolExists)
     include (CheckCSourceCompiles)
+    include (FindPkgConfig)
 
     check_include_file_cxx (istream HAVE_ISTREAM)
     check_include_file_cxx (ostream HAVE_OSTREAM)
@@ -131,7 +132,9 @@ if (UNIX)
     # curl is used on both Linux and Mac
     find_package (CURL)
     if (CURL_FOUND)
-        list (APPEND libs curl)
+        include_directories(${CURL_INCLUDE_DIRS})
+        list (APPEND libs ${CURL_LIBRARIES})
+
     else()
         message (FATAL_ERROR "Missing library: curl")
     endif()
@@ -163,6 +166,12 @@ if (UNIX)
             link_directories("/usr/local/lib")
         endif()
 
+        if (${PKG_CONFIG_FOUND})
+            pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
+            include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
+            set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
+        endif ()
+
         set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
         set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
         check_type_size ("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
@@ -187,7 +196,7 @@ if (UNIX)
             message (FATAL_ERROR "Missing header: " ${XKBlib})
         endif()
 
-        if (NOT HAVE_DNSSD)
+        if (BARRIER_BUILD_GUI AND NOT HAVE_DNSSD)
             message (FATAL_ERROR "Missing header: dns_sd.h")
         endif()
 
@@ -302,13 +311,28 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
         ${OPENSSL_ROOT}/lib/ssleay32.lib
     )
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (OPENSSL_ROOT /usr/local/opt/openssl)
 
-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
-    set (OPENSSL_LIBS
-        ${OPENSSL_ROOT}/lib/libssl.a
-        ${OPENSSL_ROOT}/lib/libcrypto.a
-    )
+    if (IS_DIRECTORY /opt/local)
+        # macports
+        set (OPENSSL_ROOT /opt/local)
+
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+            z
+        )
+    elseif (IS_DIRECTORY /usr/local/opt/openssl)
+        # brew
+        set (OPENSSL_ROOT /usr/local/opt/openssl)
+
+        include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+
+        set (OPENSSL_LIBS
+            ${OPENSSL_ROOT}/lib/libssl.a
+            ${OPENSSL_ROOT}/lib/libcrypto.a
+        )
+    endif()
+
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set (OPENSSL_LIBS ssl crypto)
 else()