X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=7e238174cd7dcfa0f04c82bc5a3a5a168594407c;hp=47a672e7c2b3048ffac5655ecbf6cf22a44c2e94;hb=bc715c756677bee7cdb7109cc656e3e5f526c988;hpb=1c8c7ffcfad6f37d2810c4130a23c95ca7ba2a46

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a672e7..7e238174 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,11 @@ include(FeatureSummary)
 include(QuasselCompileSettings)
 include(QuasselMacros)
 
+# Setting COMPILE_DEFINITIONS_<CONFIG> is deprecated since CMake 3.0 in favor of generator expressions.
+# These have existed since CMake 2.8.10; until we depend on that, we have to explicitly enable the old policy.
+if (CMAKE_MAJOR_VERSION GREATER 2)
+    cmake_policy(SET CMP0043 OLD)
+endif()
 
 # Options and variables that can be set on the command line
 #####################################################################
@@ -145,12 +150,18 @@ endif()
 # using -DCMAKE_DISABLE_FIND_PACKAGE_<PkgName>=TRUE
 #####################################################################
 
-if(USE_QT5)
+if (USE_QT5)
     find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
     set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
         URL "http://qt.digia.com"
         DESCRIPTION "contains core functionality for Qt"
     )
+    # find_package without REQUIRED won't check for the version properly; also, older Qt5 versions
+    # used Qt5Core_VERSION_STRING... let's just make sure here that we bail out here if our Qt5 is not new enough.
+    if (NOT Qt5Core_VERSION OR Qt5Core_VERSION VERSION_LESS ${QT_MIN_VERSION})
+        message(FATAL_ERROR "Could NOT find Qt5 >= version ${QT_MIN_VERSION}!")
+    endif()
+
     find_package(Qt5Network QUIET)
     set_package_properties(Qt5Network PROPERTIES TYPE REQUIRED
         DESCRIPTION "the network module for Qt5"
@@ -188,15 +199,30 @@ if(USE_QT5)
             PURPOSE     "Required for audio notifications"
         )
 
+        find_package(LibsnoreQt5 QUIET)
+        set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
+            URL "https://github.com/TheOneRing/Snorenotify"
+            DESCRIPTION "a cross-platform notification framework"
+            PURPOSE     "Enable support for the snorenotify framework"
+        )
+
         if (WITH_WEBKIT)
-            find_package(Qt5Webkit QUIET)
-            set_package_properties(Qt5Webkit PROPERTIES TYPE RECOMMENDED
+            find_package(Qt5WebKit QUIET)
+            set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
                 URL "http://qt.digia.com"
-                DESCRIPTION "a Webkit implementation for Qt"
+                DESCRIPTION "a WebKit implementation for Qt"
                 PURPOSE     "Needed for displaying previews for URLs in chat"
             )
+            if (Qt5WebKit_FOUND)
+                find_package(Qt5WebKitWidgets QUIET)
+                set_package_properties(Qt5WebKitWidgets PROPERTIES TYPE RECOMMENDED
+                    URL "http://qt.digia.com"
+                    DESCRIPTION "widgets for Qt's WebKit implementation"
+                    PURPOSE     "Needed for displaying previews for URLs in chat"
+                )
+            endif()
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" Qt5Webkit_FOUND "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
 
     endif(BUILD_GUI)
     if (BUILD_CORE)
@@ -225,16 +251,23 @@ if(USE_QT5)
                            DESCRIPTION "contains tools for handling translation files"
                            PURPOSE "Required for having translations"
     )
-    # Qt5 does not define a target for lconvert, so we need to find it ourselves
+    # Some Qt5 versions do not define a target for lconvert, so we need to find it ourselves
     if (Qt5LinguistTools_FOUND)
         if (NOT TARGET Qt5::lconvert AND TARGET Qt5::lrelease)
             get_target_property(_lrelease_location Qt5::lrelease LOCATION)
             get_filename_component(_lrelease_path ${_lrelease_location} PATH)
             find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert-qt5 lconvert PATHS ${_lrelease_path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+        elseif(TARGET Qt5::lconvert AND NOT Qt5_LCONVERT_EXECUTABLE)
+            # Newer Qt5 versions define the target, but not the Qt5_LCONVERT_EXECUTABLE variable for some reason
+            get_target_property(QT_LCONVERT_EXECUTABLE Qt5::lconvert LOCATION)
         endif()
+
         # Compatibility with the Qt4 variables
-        set (QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
-        set (QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
+        set(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
+        set(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
+        if (Qt5_LCONVERT_EXECUTABLE)
+            set(QT_LCONVERT_EXECUTABLE ${Qt5_LCONVERT_EXECUTABLE})
+        endif()
     endif()
 
 else(USE_QT5)
@@ -254,7 +287,7 @@ else(USE_QT5)
         if (WITH_WEBKIT AND QT_QTWEBKIT_FOUND)
             set(HAVE_WEBKIT true)
         endif()
-        add_feature_info("WITH_WEBKIT and QtWebkit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
+        add_feature_info("WITH_WEBKIT and QtWebKit module" HAVE_WEBKIT "Support showing previews for URLs in chat")
 
         if (WITH_KDE)
             # KDE has overzealous CFLAGS making miniz not compile, so save our old flags
@@ -432,10 +465,14 @@ endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 if(WIN32)
   link_libraries(imm32 winmm dbghelp Secur32)  # missing by default :/
   if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNOMINMAX")
     set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBUGINFO "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUGFULL "${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
     link_libraries(Version dwmapi shlwapi)
+    if(USE_QT5)
+      set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+    endif(USE_QT5)
   endif(MSVC)
   if(HAVE_SSL AND STATIC)
      find_package(OpenSSL REQUIRED)