X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=3601b0fe536aaeb3506fcaaea669792e14142e0d;hp=69945fc930e7a443cbcca826616942bc772b2453;hb=14dbd6c44d159c7ca96db9424923962011f7b861;hpb=75b56fa155ec64fbe2a0a1a1aefe79f80646767c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69945fc9..3601b0fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,6 @@ if(HAVE_EXECINFO)
   add_definitions(-DHAVE_EXECINFO)
 endif(HAVE_EXECINFO)
 
-
 # Select a Qt installation here, if you don't want to use system Qt
 if(QT)
   # FindQt4 will look for the qmake binary in $PATH, so we just prepend the Qt dir
@@ -126,31 +125,48 @@ set(QT_DONT_USE_QTGUI 1)
 include(${QT_USE_FILE})
 include_directories(${QT_INCLUDES})
 
-# Set up OpenSSL
+# Setup OpenSSL
 if(WITH_OPENSSL)
   find_package(OpenSSL)
+else(WITH_OPENSSL)
+  message(STATUS "Disabling OpenSSL support")
 endif(WITH_OPENSSL)
+
 if(OPENSSL_FOUND)
   if(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+    message(STATUS "Found OpenSSL support in Qt")
     add_definitions(-DHAVE_SSL)
     set(HAVE_SSL true)
+    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_SSL)
+  else(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+    message(STATUS "No OpenSSL support found in Qt, disabling")
   endif(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
 else(OPENSSL_FOUND)
   add_definitions(-DQT_NO_OPENSSL)
 endif(OPENSSL_FOUND)
 
-if(WITH_DBUS AND QT_QTDBUS_FOUND)
-  add_definitions(-DHAVE_DBUS)
-  set(LINK_DBUS DBUS)
-  set(HAVE_DBUS true)
-endif(WITH_DBUS AND QT_QTDBUS_FOUND)
+# Setup D-Bus support
+if(WITH_DBUS)
+  if(QT_QTDBUS_FOUND)
+    message(STATUS "Found QtDBus, enabling D-Bus support")
+    add_definitions(-DHAVE_DBUS)
+    set(LINK_DBUS DBUS)
+    set(HAVE_DBUS true)
+    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_DBUS)
+  else(QT_QTDBUS_FOUND)
+    message(STATUS "QtDBus not found, disabling D-Bus support")
+  endif(QT_QTDBUS_FOUND)
+else(WITH_DBUS)
+  message(STATUS "Disabling D-Bus support")
+endif(WITH_DBUS)
 
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.
 add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)
 target_link_libraries(genversion ${QT_LIBRARIES} ${QT_CORE_LIB_DEPENDENCIES})
 
-add_custom_target(genversion_run ALL ${CMAKE_BINARY_DIR}/genversion
+get_target_property(GENVERSION_EXECUTABLE genversion LOCATION)
+add_custom_target(genversion_run ALL ${GENVERSION_EXECUTABLE}
                   ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/src/common/version.gen)
 add_dependencies(genversion_run genversion)