X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=36218f465fe6ed32ede0fe36ff3b16d6c2485719;hb=2b44b945cf50e3dbfeabe4e5aee10db4b13f5a64;hp=0191c811c507638664db46091a834ada75d2f94b;hpb=3dc6e69f93fb1c0af8120e52052fbf513076025c;p=quassel.git

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0191c811..36218f46 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -46,21 +46,32 @@ set(SOURCES
 )
 
 
-if (HAVE_QCA2)
+if (QCA2_FOUND)
     set(SOURCES ${SOURCES} keyevent.cpp)
-endif(HAVE_QCA2)
+endif()
 
-if (NOT ZLIB_FOUND)
+if (ZLIB_FOUND)
+    add_definitions(-DHAVE_ZLIB)
+    include_directories(${ZLIB_INCLUDE_DIRS})
+else()
     set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
 endif()
 
+if (HAVE_SYSLOG)
+    add_definitions(-DHAVE_SYSLOG)
+endif()
+
 if(APPLE)
   set(SOURCES ${SOURCES} mac_utils.cpp)
 endif(APPLE)
 
 if (WIN32)
     set(SOURCES ${SOURCES} logbacktrace_win.cpp)
-elseif (UNIX)
+else()
+    if (EXECINFO_FOUND)
+        add_definitions(-DHAVE_EXECINFO)
+        include_directories(${EXECINFO_INCLUDES})
+    endif()
     set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
 endif()
 
@@ -71,4 +82,4 @@ if(APPLE)
   target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
 endif(APPLE)
 
-target_link_libraries(mod_common ${CMAKE_DL_LIBS})
+target_link_libraries(mod_common ${CMAKE_DL_LIBS} ${EXECINFO_LIBRARIES} ${ZLIB_LIBRARIES})