X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=4a84373c24f3f7124e52075b61f3afa8eaf83089;hp=dca706059e3a726fb439f1dc900613602e2937c0;hb=c9570fed0a39156d87ebce85b19dd0dd67738866;hpb=6b30ecba9a2decca54b394b26495cbed31a6f193 diff --git a/CMakeLists.txt b/CMakeLists.txt index dca70605..4a84373c 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 4) +set(QUASSEL_VERSION_STRING "0.12.4") # 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.90 QUIET) + find_package(LibsnoreQt5 0.7.0 QUIET) set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL - URL "https://github.com/Snorenotify/Snorenotify" + 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() {}"