X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=3601b0fe536aaeb3506fcaaea669792e14142e0d;hp=04aa07ac24ae0cfe9fe01a30fdf2d29d7021844c;hb=85b55cf023c96f4dbd61ec415a15214f99e281b3;hpb=b2fe17d9e5973684c7c965c614309970d64c817b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04aa07ac..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
@@ -138,6 +137,7 @@ if(OPENSSL_FOUND)
     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")
@@ -152,6 +152,7 @@ if(WITH_DBUS)
     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)
@@ -164,7 +165,8 @@ endif(WITH_DBUS)
 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)