X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=1762959e30fc5ebad0471d422f4a8087ec19ce36;hp=0e9296bb20497795cdfc28c536f27b659ef16c81;hb=refs%2Ftags%2F0.12.5;hpb=0e755439e2447649e91c2d016e088b05b4637add diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e9296bb..1762959e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,12 @@ project(QuasselIRC) # Versions set(QUASSEL_MAJOR 0) set(QUASSEL_MINOR 12) -set(QUASSEL_PATCH 4) -set(QUASSEL_VERSION_STRING "0.12.4") +set(QUASSEL_PATCH 5) +set(QUASSEL_VERSION_STRING "0.12.5") -# We want to know CMake's version for debug reasons +# Output CMake version and build type for debug reasons message(STATUS "Using CMake ${CMAKE_VERSION}") +message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}") # Tell CMake about or own modules set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -76,17 +77,20 @@ 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) if (APPLE) # Notification Center is only available in > 10.8, which is Darwin v12 - if (CMAKE_SYSTEM_VERSION VERSION_GREATER "11.9.9") + if (NOT CMAKE_SYSTEM_VERSION VERSION_LESS 12) option(WITH_NOTIFICATION_CENTER "OS X Notification Center support" ON) add_feature_info(WITH_NOTIFICATION_CENTER WITH_NOTIFICATION_CENTER "Use the OS X Notification Center") endif() + find_library(CARBON_LIBRARY Carbon) + mark_as_advanced(CARBON_LIBRARY) + link_libraries(${CARBON_LIBRARY}) endif() # Always embed on Windows, OSX or for a static build; never embed when enabling KDE integration @@ -139,6 +143,11 @@ if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() +# Don't automoc generated files +if (POLICY CMP0071) + cmake_policy(SET CMP0071 OLD) +endif() + # Simplify later checks ##################################################################### @@ -154,22 +163,6 @@ endif() # Set up Qt ##################################################################### -if (USE_QT5) - message(STATUS "Building for Qt5...") - set(QT_MIN_VERSION "5.2.0") - add_definitions(-DHAVE_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() -endif() - - # Find package dependencies # # Note that you can forcefully disable optional packages @@ -177,6 +170,10 @@ endif() ##################################################################### if (USE_QT5) + message(STATUS "Building for Qt5...") + set(QT_MIN_VERSION "5.2.0") + add_definitions(-DHAVE_QT5) + find_package(Qt5Core ${QT_MIN_VERSION} QUIET) set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED URL "http://qt.digia.com" @@ -203,19 +200,21 @@ if (USE_QT5) DESCRIPTION "the widgets module for Qt5" ) - find_package(Qt5DBus QUIET) - set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED - URL "http://qt.digia.com" - DESCRIPTION "D-Bus support for Qt5" - PURPOSE "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments" - ) - if (Qt5DBus_FOUND) - find_package(dbusmenu-qt5 QUIET CONFIG) - set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED - URL "https://launchpad.net/libdbusmenu-qt" - DESCRIPTION "a library implementing the DBusMenu specification" - PURPOSE "Required for having a context menu for the D-Bus-based tray icon" + if (NOT WIN32) + find_package(Qt5DBus QUIET) + set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED + URL "http://qt.digia.com" + DESCRIPTION "D-Bus support for Qt5" + PURPOSE "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments" ) + if (Qt5DBus_FOUND) + find_package(dbusmenu-qt5 QUIET CONFIG) + set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED + URL "https://launchpad.net/libdbusmenu-qt" + DESCRIPTION "a library implementing the DBusMenu specification" + PURPOSE "Required for having a context menu for the D-Bus-based tray icon" + ) + endif() endif() find_package(Phonon4Qt5 QUIET) @@ -364,6 +363,15 @@ if (USE_QT5) endif() else(USE_QT5) + 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) @@ -610,7 +618,7 @@ git_describe(GIT_DESCRIBE --long) # If in a Git repo we can get the commit-date from a git command if (GIT_HEAD) execute_process( - COMMAND git show -s --format=%ct + COMMAND git -c log.showsignature=false show -s --format=%ct WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE