X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=b5164ca78455ca415ac2738ca8dd7cff92fb8dad;hp=310cf8fcf9bbb74902c07b18a152853975c55ad3;hb=12a6abcfe51ac66e8763b3caadaedcb47c2723f1;hpb=48d41896ba35eafc64b4cb00e446d6123b3502cb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 310cf8fc..b5164ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,12 @@ endif()
 # Set up project
 project(Quassel CXX)
 
-# General conveniences
+# Let CMake handle file generation for Qt
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+# Needed, otherwise some .moc files won't be found with older CMake versions
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Include various CMake modules...
@@ -80,13 +84,6 @@ add_feature_info(WITH_BUNDLED_ICONS WITH_BUNDLED_ICONS "Install required icons f
 option(WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)" OFF)
 add_feature_info(WITH_OXYGEN_ICONS WITH_OXYGEN_ICONS "Support the Oxygen icon theme (KDE4)")
 
-if (WITH_BUNDLED_ICONS)
-    add_definitions(-DWITH_BUNDLED_ICONS)
-endif()
-if (WITH_OXYGEN_ICONS)
-    add_definitions(-DWITH_OXYGEN_ICONS)
-endif()
-
 # For this, the feature info is added after we know if QtWebkit is installed
 option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
 
@@ -127,23 +124,11 @@ option(WITH_LDAP "Enable LDAP authentication support if present on system" ON)
 # Setup CMake
 #####################################################################
 
-# 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 (POLICY CMP0043)
-    cmake_policy(SET CMP0043 OLD)
-endif()
-
-# Honor visibility settings for all target types
-if (POLICY CMP0063)
-    cmake_policy(SET CMP0063 NEW)
-endif()
-
-# Don't automoc generated files
+# Let automoc/autouic process generated files
 if (POLICY CMP0071)
-    cmake_policy(SET CMP0071 OLD)
+    cmake_policy(SET CMP0071 NEW)
 endif()
 
-
 # Simplify later checks
 #####################################################################
 
@@ -165,35 +150,32 @@ endif()
 #####################################################################
 
 set(QT_MIN_VERSION "5.5.0")
-add_definitions(-DHAVE_QT5)
 
-find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
-set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
+# Required Qt components
+set(qt_components Core Network)
+if (BUILD_GUI)
+    list(APPEND qt_components Gui Widgets)
+endif()
+if (BUILD_CORE)
+    list(APPEND qt_components Script Sql)
+endif()
+
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${qt_components})
+set_package_properties(Qt5 PROPERTIES TYPE REQUIRED
     URL "https://www.qt.io/"
-    DESCRIPTION "contains core functionality for Qt"
+    DESCRIPTION "the Qt libraries"
 )
+message(STATUS "Found Qt ${Qt5Core_VERSION}")
 
-# 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()
+# Optional Qt components
 
-find_package(Qt5Network QUIET)
-set_package_properties(Qt5Network PROPERTIES TYPE REQUIRED
-    DESCRIPTION "the network module for Qt5"
+find_package(Qt5LinguistTools QUIET)
+set_package_properties(Qt5LinguistTools PROPERTIES TYPE RECOMMENDED
+    DESCRIPTION "contains tools for handling translation files"
+    PURPOSE "Required for having translations"
 )
 
 if (BUILD_GUI)
-    find_package(Qt5Gui QUIET)
-    set_package_properties(Qt5Gui PROPERTIES TYPE REQUIRED
-        DESCRIPTION "the GUI module for Qt5"
-    )
-    find_package(Qt5Widgets QUIET)
-    set_package_properties(Qt5Widgets PROPERTIES TYPE REQUIRED
-        DESCRIPTION "the widgets module for Qt5"
-    )
-
     if (NOT WIN32)
         find_package(Qt5DBus QUIET)
         set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED
@@ -224,37 +206,15 @@ if (BUILD_GUI)
         DESCRIPTION "a cross-platform notification framework"
         PURPOSE     "Enable support for the snorenotify framework"
     )
-    if(LibsnoreQt5_FOUND)
-        find_package(LibsnoreSettingsQt5)
-        set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE REQUIRED
+    if (LibsnoreQt5_FOUND)
+        find_package(LibsnoreSettingsQt5 QUIET)
+        set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE OPTIONAL
             URL "https://projects.kde.org/projects/playground/libs/snorenotify"
             DESCRIPTION "a cross-platform notification framework"
             PURPOSE     "Enable support for the snorenotify framework"
         )
     endif()
 
-    if (WITH_WEBKIT)
-        find_package(Qt5WebKit QUIET)
-        set_package_properties(Qt5WebKit PROPERTIES TYPE RECOMMENDED
-            URL "https://www.qt.io/"
-            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 "https://www.qt.io/"
-                DESCRIPTION "widgets for Qt's WebKit implementation"
-                PURPOSE     "Needed for displaying previews for URLs in chat"
-            )
-        endif()
-    endif()
-
-    if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND)
-        set(HAVE_WEBKIT true)
-    endif()
-    add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat (legacy)")
-
     if (WITH_WEBENGINE)
         find_package(Qt5WebEngine QUIET)
         set_package_properties(Qt5WebEngine PROPERTIES TYPE RECOMMENDED
@@ -277,18 +237,43 @@ if (BUILD_GUI)
     endif()
     add_feature_info("WITH_WEBENGINE, QtWebEngine and QtWebEngineWidgets modules" HAVE_WEBENGINE "Support showing previews for URLs in chat")
 
+    if (NOT HAVE_WEBENGINE)
+        if (WITH_WEBKIT)
+            find_package(Qt5WebKit QUIET)
+            set_package_properties(Qt5WebKit PROPERTIES TYPE OPTIONAL
+                URL "https://www.qt.io/"
+                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 OPTIONAL
+                    URL "https://www.qt.io/"
+                    DESCRIPTION "widgets for Qt's WebKit implementation"
+                    PURPOSE     "Needed for displaying previews for URLs in chat"
+                    )
+            endif()
+        endif()
+
+        if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND)
+            set(HAVE_WEBKIT true)
+        endif()
+        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat (legacy)")
+    endif()
+
     # KDE Frameworks
     ################
 
+    # extra-cmake-modules
     if (WITH_KDE)
         set(ecm_find_type "REQUIRED")
+        find_package(ECM NO_MODULE REQUIRED)
     else()
         # Even with KDE integration disabled, we optionally use tier1 frameworks if we find them
         set(ecm_find_type "RECOMMENDED")
+        find_package(ECM NO_MODULE QUIET)
     endif()
 
-    # extra-cmake-modules
-    find_package(ECM NO_MODULE QUIET)
     set_package_properties(ECM PROPERTIES TYPE ${ecm_find_type}
         URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
         DESCRIPTION "extra modules for CMake, maintained by the KDE project"
@@ -298,69 +283,51 @@ if (BUILD_GUI)
     if (ECM_FOUND)
         list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
         if (WITH_KDE)
-            find_package(KF5 COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig Sonnet TextWidgets WidgetsAddons XmlGui QUIET)
+            find_package(KF5 REQUIRED COMPONENTS ConfigWidgets CoreAddons Notifications NotifyConfig Sonnet TextWidgets WidgetsAddons XmlGui)
             set_package_properties(KF5 PROPERTIES TYPE REQUIRED
                 URL "http://www.kde.org"
                 DESCRIPTION "KDE Frameworks"
                 PURPOSE     "Required for integration into the Plasma desktop"
             )
-        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"
-            )
+            message(STATUS "Found KDE Frameworks ${KF5_VERSION}")
         endif()
-    endif()
 
+        # Optional KF5 tier1 components
+        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()
 endif()
 
 if (BUILD_CORE)
-    find_package(Qt5Script QUIET)
-    set_package_properties(Qt5Script PROPERTIES TYPE REQUIRED
-        DESCRIPTION "provides scripting support for Qt5"
-    )
-    find_package(Qt5Sql QUIET)
-    set_package_properties(Qt5Sql PROPERTIES TYPE REQUIRED
-        DESCRIPTION "the database support module for Qt5"
-    )
-
-    find_package(Qca-qt5 2.0)
+    find_package(Qca-qt5 2.0 QUIET)
     set_package_properties(Qca-qt5 PROPERTIES TYPE RECOMMENDED
         URL "https://projects.kde.org/projects/kdesupport/qca"
         DESCRIPTION "Qt Cryptographic Architecture"
         PURPOSE "Required for encryption support"
     )
 
-endif()
-
-find_package(Qt5LinguistTools QUIET)
-set_package_properties(Qt5LinguistTools PROPERTIES TYPE RECOMMENDED
-    DESCRIPTION "contains tools for handling translation files"
-    PURPOSE "Required for having translations"
-)
-
-# 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})
-    if (Qt5_LCONVERT_EXECUTABLE)
-        set(QT_LCONVERT_EXECUTABLE ${Qt5_LCONVERT_EXECUTABLE})
+    if (WITH_LDAP)
+        find_package(Ldap QUIET)
+        set_package_properties(Ldap PROPERTIES TYPE OPTIONAL
+            URL "http://www.openldap.org/"
+            DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries"
+            PURPOSE "Enables core user authentication via LDAP"
+        )
     endif()
 endif()
 
 # Non-Qt-based packages
+#####################################################################
+
+find_package(Boost 1.56 REQUIRED)
+set_package_properties(Boost PROPERTIES TYPE REQUIRED
+    URL "https://www.boost.org/"
+    DESCRIPTION "Boost libraries for C++"
+)
 
 find_package(ZLIB REQUIRED)
 set_package_properties(ZLIB PROPERTIES TYPE REQUIRED
@@ -378,17 +345,32 @@ if (NOT WIN32)
     )
 endif()
 
-# Check for SSL support in Qt
-# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile
-# a small test program checking the defines. This works for both Qt4 and Qt5.
-cmake_push_check_state(RESET)
-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+# Setup unit testing
+#####################################################################
 
-if (Qt5_POSITION_INDEPENDENT_CODE)
-    set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
+option(BUILD_TESTING "Enable unit tests" OFF)
+add_feature_info(BUILD_TESTING BUILD_TESTING "Build unit tests")
+
+if (BUILD_TESTING)
+    find_package(GTest QUIET)
+    set_package_properties(GTest PROPERTIES TYPE REQUIRED
+        DESCRIPTION "Google's unit testing framework"
+        PURPOSE "Required for building unit tests"
+    )
+
+    find_package(Qt5Test QUIET)
+    set_package_properties(Qt5Test PROPERTIES TYPE REQUIRED
+        DESCRIPTION "unit testing library for the Qt5 framework"
+        PURPOSE "Required for building unit tests"
+    )
+    enable_testing()
 endif()
 
+# Check for SSL support in Qt
+#####################################################################
+
+cmake_push_check_state(RESET)
+set(CMAKE_REQUIRED_LIBRARIES Qt5::Core)
 check_cxx_source_compiles("
     #include \"qglobal.h\"
     #if defined QT_NO_SSL
@@ -398,15 +380,14 @@ check_cxx_source_compiles("
     HAVE_SSL)
 cmake_pop_check_state()
 
+if (HAVE_SSL)
+    add_definitions(-DHAVE_SSL)
+endif()
+add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
+
 # Additional compile settings
 #####################################################################
 
-# This sets -fPIC and friends if required by the installed Qt5 library
-if (Qt5_POSITION_INDEPENDENT_CODE)
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    set(CMAKE_REQUIRED_FLAGS "-DQT_NO_VERSION_TAGGING")
-endif()
-
 # Needed to compile with mingw without kde
 if (MINGW AND NOT WITH_KDE)
     add_definitions(-D_WIN32_WINNT=0x0500)
@@ -415,26 +396,6 @@ if (MINGW AND NOT WITH_KDE)
     add_definitions(-U__STRICT_ANSI__)
 endif()
 
-# Sanitize compiler flags - old versions of KDE set -ansi, which breaks -std=c++11
-if (CMAKE_COMPILER_IS_GNUCXX)
-    string(REPLACE "-ansi" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-endif()
-
-# Setup LDAP Authentication support.
-#####################################################################
-if (WITH_LDAP)
-    find_package(Ldap)
-    if (LDAP_FOUND)
-        message(STATUS "Enabling LDAP authentication support")
-        set(HAVE_LDAP true)
-        add_definitions(-DHAVE_LDAP)
-    else()
-        message(STATUS "Disabling LDAP authentication support")
-    endif()
-else()
-    message(STATUS "Not enabling LDAP authentication support")
-endif()
-
 # Setup support for KDE Frameworks
 #####################################################################
 
@@ -457,13 +418,33 @@ endif()
 # This needs to come after setting up KDE integration, so we can use KDE-specific paths
 include(QuasselInstallDirs)
 
-# Various config-dependent checks and settings
+# RPATH and output settings
 #####################################################################
 
-if (HAVE_SSL)
-    add_definitions(-DHAVE_SSL)
+# Build artifacts in a well-known location; especially important for Windows DLLs
+# (which go into RUNTIME_OUTPUT_DIRECTORY and can thus be found by executables)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+
+# These RPATH settings allow for running directly from the build dir
+set(CMAKE_SKIP_BUILD_RPATH            FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH    FALSE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
+
+# Set install RPATH only if libdir isn't a system directory
+if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+    set(libdir "${CMAKE_INSTALL_LIBDIR}")
+else()
+    set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()
-add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir}" is_systemdir)
+if ("${is_systemdir}" STREQUAL "-1")
+   set(CMAKE_INSTALL_RPATH "${libdir}")
+endif()
+
+# Various config-dependent checks and settings
+#####################################################################
 
 # Check for syslog support
 if (NOT WIN32)
@@ -471,7 +452,9 @@ if (NOT WIN32)
     add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
 endif()
 
-add_feature_info("Qt Linguist Tools" QT_LCONVERT_EXECUTABLE "Translation support for Quassel")
+if (NOT WIN32)
+    check_function_exists(umask HAVE_UMASK)
+endif()
 
 if (EMBED_DATA)
     message(STATUS "Embedding data files into the binary")
@@ -479,14 +462,6 @@ else()
     message(STATUS "Installing data files separately")
 endif()
 
-if (NOT WIN32)
-    check_function_exists(umask HAVE_UMASK)
-    if(HAVE_UMASK)
-        add_definitions(-DHAVE_UMASK)
-    endif()
-endif()
-
-
 # Windows-specific stuff
 #####################################################################
 
@@ -498,7 +473,6 @@ if (WIN32)
         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)
-        set(QT_QTMAIN_LIBRARY Qt5::WinMain)
     endif()
 endif()
 
@@ -543,18 +517,12 @@ configure_file(version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
 # Prepare the build
 #####################################################################
 
-# These variables will be added to the main targets (CORE, QTCLIENT, MONO)
-set(COMMON_DEPS ${RC_WIN32})
-set(CORE_DEPS )
-set(CLIENT_DEPS )
-
 # Add needed subdirs - the order is important, since src needs some vars set by other dirs
 add_subdirectory(data)
 add_subdirectory(icons)
 add_subdirectory(pics)
 add_subdirectory(po)
 
-
 # Set up and display feature summary
 #####################################################################
 
@@ -569,3 +537,8 @@ feature_summary(WHAT ALL
 #####################################################################
 
 add_subdirectory(src)
+
+# Build tests if so desired
+if (BUILD_TESTING)
+    add_subdirectory(tests)
+endif()