X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=CMakeLists.txt;h=03aabeed67b84051ae30749c205c8bfb75e1ea66;hb=98d707da4f2e7670efcadaaab3e13baf37838c56;hp=c21f94daeb6ce40dcd8ae5c67cb623c78261fe06;hpb=79ef34a9495187b296dd554cf57983019001c38b;p=quassel.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c21f94da..03aabeed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,9 +217,9 @@ if (USE_QT5) PURPOSE "Required for audio notifications" ) - find_package(LibsnoreQt5 0.5.90 QUIET) + find_package(LibsnoreQt5 0.5.70 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" ) @@ -413,6 +413,20 @@ 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}") +check_cxx_source_compiles(" + #include \"qglobal.h\" + #if defined QT_NO_SSL + # error \"No SSL support\" + #endif + int main() {}" + HAVE_SSL) +cmake_pop_check_state() # Additional compile settings ##################################################################### @@ -476,20 +490,6 @@ if (NOT ZLIB_FOUND) endif() 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}) -check_cxx_source_compiles(" - #include \"qglobal.h\" - #if defined QT_NO_OPENSSL || defined QT_NO_SSL - # error \"No SSL support\" - #endif - int main() {}" - HAVE_SSL) -cmake_pop_check_state() - if (HAVE_SSL) add_definitions(-DHAVE_SSL) endif()