X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=CMakeLists.txt;h=778864e7e15b13002c6f969b6bed94f9142862c5;hb=76ecd41e6b901e163cfcd5fe2e140d0bbb68af91;hp=4073ee2c8f57010d05dbe8853d2527521bef2d12;hpb=d73c97f337c815af50cd022adb0a1c51a8075f8e;p=quassel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4073ee2c..778864e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ project(QuasselIRC) # Versions set(QUASSEL_MAJOR 0) set(QUASSEL_MINOR 12) -set(QUASSEL_PATCH 2) -set(QUASSEL_VERSION_STRING "0.12.2") +set(QUASSEL_PATCH 3) +set(QUASSEL_VERSION_STRING "0.12.3") # We want to know CMake's version for debug reasons message(STATUS "Using CMake ${CMAKE_VERSION}") @@ -217,12 +217,21 @@ if (USE_QT5) PURPOSE "Required for audio notifications" ) - find_package(LibsnoreQt5 0.5.70 QUIET) + find_package(LibsnoreQt5 0.7.0 QUIET) set_package_properties(LibsnoreQt5 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" ) + if(LibsnoreQt5_FOUND) + find_package(LibsnoreSettingsQt5) + set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE REQUIRED + 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) @@ -421,7 +430,7 @@ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") check_cxx_source_compiles(" #include \"qglobal.h\" - #if defined QT_NO_OPENSSL || defined QT_NO_SSL + #if defined QT_NO_SSL # error \"No SSL support\" #endif int main() {}"