X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=e0cf847f448fecda0bbbad396d5cd5139fd3e72e;hp=4baf76a1f1c4a46fe2f4d872fd4c07ef8a209035;hb=90acec489765f6451a1bf70fd6ffb2574594d907;hpb=e5a433c13efbd7831520787ceb707bda80f49de7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4baf76a1..e0cf847f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ else(upper_build_type STREQUAL "RELEASE" OR upper_build_type STREQUAL "RELWITHDE
 endif(upper_build_type STREQUAL "RELEASE" OR upper_build_type STREQUAL "RELWITHDEBUGINFO")
 
 if(WANT_MONO OR WANT_QTCLIENT)
-  set(QT_MIN_VERSION "4.5.0")
+  set(QT_MIN_VERSION "4.6.0")
 else(WANT_MONO OR WANT_QTCLIENT)
   set(QT_MIN_VERSION "4.4.0")
 endif(WANT_MONO OR WANT_QTCLIENT)
@@ -191,7 +191,7 @@ if(WITH_WEBKIT)
   if(QT_QTWEBKIT_FOUND)
     message(STATUS "Found QtWebKit, enabling WebKit support")
     add_definitions(-DHAVE_WEBKIT)
-    set(LINK_WEBKIT WEBKIT)
+    set(LINK_WEBKIT WEBKIT XMLPATTERNS)
     set(HAVE_WEBKIT true)
   else(QT_QTWEBKIT_FOUND)
     message(STATUS "QtWebKit not found, disabling WebKit support")
@@ -249,6 +249,7 @@ if(WITH_LIBINDICATE)
     pkg_check_modules(INDICATEQT indicate-qt>=0.2.1)
     if(INDICATEQT_FOUND)
       message(STATUS "Enabling Ayatana notification support")
+      set(HAVE_INDICATEQT true)
       add_definitions(-DHAVE_INDICATEQT)
     else(INDICATEQT_FOUND)
       message(STATUS "Disabling Ayatana notification support")
@@ -256,6 +257,8 @@ if(WITH_LIBINDICATE)
   endif(PKG_CONFIG_FOUND)
 else(WITH_LIBINDICATE)
   message(STATUS "Not enabling Ayatana notification support")
+  # We don't want to link against it even if another package has found it
+  set(INDICATEQT_LIBRARIES "")
 endif(WITH_LIBINDICATE)
 
 # Now set up install locations; those are set by KDE if integration is enabled
@@ -298,6 +301,9 @@ endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 if(WIN32)
   link_libraries(imm32 winmm dbghelp Secur32)  # missing by default :/
   if(MSVC)
+    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBUGINFO "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBUGINFO}")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUGFULL "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBUGINFO}")
     link_libraries(Version dwmapi shlwapi)
   endif(MSVC)
   if(HAVE_SSL AND STATIC)
@@ -306,9 +312,9 @@ if(WIN32)
   endif(HAVE_SSL AND STATIC)
 endif(WIN32)
 
-if(INDICATEQT_FOUND)
+if(HAVE_INDICATEQT)
   add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR})
-endif(INDICATEQT_FOUND)
+endif(HAVE_INDICATEQT)
 
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.