fixing mac os build and deploy scripts

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e28d90f..60da133 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
-   cmake_policy(SET CMP0005 NEW)
 endif(COMMAND cmake_policy)
 
 # Use our own (well, and KDE's) version of some modules
@@ -34,6 +33,7 @@ option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
 
 option(WITH_OPENSSL  "Enable OpenSSL support if present on the system" ON)
 option(WITH_DBUS     "Enable D-Bus support if present on the system"   ON)
+option(WITH_WEBKIT   "Enable WebKit support if present on the system"  ON)
 
 option(STATIC        "Enable static building (might not be portable)" OFF)
 option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
@@ -61,8 +61,6 @@ set(DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps)
 set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
 set(XDG_APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
 
-add_definitions(-DPREFIX=${CMAKE_INSTALL_PREFIX})
-
 # Enable various flags on gcc
 if(CMAKE_COMPILER_IS_GNUCXX)
   # Let's just hope that all gccs support these options and skip the tests...
@@ -136,6 +134,22 @@ else(WITH_DBUS)
   message(STATUS "Disabling D-Bus support")
 endif(WITH_DBUS)
 
+# Setup QtWebKit support
+if(WITH_WEBKIT)
+  if(QT_QTWEBKIT_FOUND)
+    message(STATUS "Found QtWebKit, enabling WebKit support")
+    add_definitions(-DHAVE_WEBKIT)
+    set(LINK_WEBKIT WEBKIT)
+    set(HAVE_WEBKIT true)
+    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_WEBKIT)
+  else(QT_QTWEBKIT_FOUND)
+    message(STATUS "QtWebKit not found, disabling D-Bus support")
+  endif(QT_QTWEBKIT_FOUND)
+else(WITH_WEBKIT)
+  message(STATUS "Disabling WebKit support")
+endif(WITH_WEBKIT)
+
+
 # Set global buildflags
 # This is very much non-portable, so don't use -DSTATIC until you know what
 # you do.
@@ -155,7 +169,7 @@ if(STATIC AND WIN32)
 endif(STATIC AND WIN32)
 
 if(WIN32)
-  set(RC_WIN32 pics/win32.rc)  # for app icons on windows
+  set(RC_WIN32 ../pics/win32.rc)  # for app icons on windows
 endif(WIN32)
 
 # This is dirty, but I haven't found a cleaner way to ensure that the generated .qrc files