X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=8293af05977c62143d2450da3a0b08e92f4f6671;hp=2d2fa8c5313a3f000d10f03e81d47443b94214b2;hb=2f5718ceaa6f2ef998333fb0002f302d4d12346e;hpb=8cacd45fd61aeaa5a50ed9985577022cae00fcff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d2fa8c5..8293af05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ if (NOT WITH_KDE)
 endif()
 
 # For this, the feature info is added after we know if QtWebkit is installed
-option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" ON)
+option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
 
 # For this, the feature info is added after we know if QtWebEngine is installed
 option(WITH_WEBENGINE "WebEngine support (for link previews)" ON)
@@ -103,9 +103,6 @@ endif()
 # The following options are not for end-user consumption, so don't list them in the feature summary
 cmake_dependent_option(DEPLOY "Add required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF "APPLE" OFF)
 
-# Handle with care
-set(QT_PATH "" CACHE PATH "Path to a Qt4 installation to use instead of the system Qt (e.g. for static builds)")
-
 # Static builds are not supported and require some manual setup! Don't enable unless you know what you're doing (we don't know either)
 cmake_dependent_option(STATIC      "Enable static building (not supported)" OFF "NOT WITH_KDE" OFF)
 
@@ -311,17 +308,17 @@ if (USE_QT5)
                     DESCRIPTION "KDE Frameworks"
                     PURPOSE     "Required for integration into the Plasma desktop"
                 )
-            else(WITH_KDE)
+            else()
                 find_package(KF5Sonnet QUIET)
                 set_package_properties(KF5Sonnet PROPERTIES TYPE RECOMMENDED
                     URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/sonnet/html"
                     DESCRIPTION "framework for providing spell-checking capabilities"
                     PURPOSE "Enables spell-checking support in input widgets"
                 )
-            endif(WITH_KDE)
-        endif(ECM_FOUND)
+            endif()
+        endif()
 
-    endif(BUILD_GUI)
+    endif()
 
     if (BUILD_CORE)
         find_package(Qt5Script QUIET)
@@ -340,7 +337,7 @@ if (USE_QT5)
             PURPOSE "Required for encryption support"
         )
 
-    endif(BUILD_CORE)
+    endif()
 
     find_package(Qt5LinguistTools QUIET)
     set_package_properties(Qt5LinguistTools PROPERTIES TYPE RECOMMENDED
@@ -367,16 +364,10 @@ if (USE_QT5)
         endif()
     endif()
 
-else(USE_QT5)
+else()
     message(STATUS "Building for Qt4...")
     set(QT_MIN_VERSION "4.8.0")
 
-    # Select a Qt installation here, if you don't want to use system Qt
-    if(QT_PATH)
-        # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
-        set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH})
-    endif()
-
     find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED)
 
     if (BUILD_GUI)
@@ -406,14 +397,14 @@ else(USE_QT5)
             )
             set(CMAKE_C_FLAGS ${_cflags})
 
-        else(WITH_KDE)
+        else()
             find_package(Phonon QUIET)
             set_package_properties(Phonon PROPERTIES TYPE RECOMMENDED
                 URL "https://projects.kde.org/projects/kdesupport/phonon"
                 DESCRIPTION "a multimedia abstraction library"
                 PURPOSE     "Required for audio notifications"
             )
-        endif(WITH_KDE)
+        endif()
 
         find_package(IndicateQt QUIET)
         set_package_properties(IndicateQt PROPERTIES TYPE OPTIONAL
@@ -422,7 +413,7 @@ else(USE_QT5)
             PURPOSE     "Provides integration into the Ayatana notification system used by e.g. Ubuntu"
         )
 
-    endif(BUILD_GUI)
+    endif()
 
     if (BUILD_CORE)
 
@@ -574,7 +565,7 @@ if (NOT WIN32)
     check_function_exists(umask HAVE_UMASK)
     if(HAVE_UMASK)
         add_definitions(-DHAVE_UMASK)
-    endif(HAVE_UMASK)
+    endif()
 endif()
 
 
@@ -635,7 +626,7 @@ endif()
 if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
   if (DEFINED ENV{GIT_HEAD})
       set(GIT_HEAD $ENV{GIT_HEAD})
-  endif ()
+  endif()
   if (DEFINED ENV{GIT_DESCRIBE})
      set(GIT_DESCRIBE $ENV{GIT_DESCRIBE})
   endif()