X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=61428e2ba65d0113bb8f1b4c1195f853838f43f6;hp=cd9f79d22db85ddd276e3d125b43fb1819bdb1fd;hb=df38a9238d603ec8d2040619befa50980d994916;hpb=ee98ad1aa528cf9e923be8750aef8dac7b1b3f8e diff --git a/CMakeLists.txt b/CMakeLists.txt index cd9f79d2..61428e2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,6 +179,25 @@ set_package_properties(Qt5 PROPERTIES TYPE REQUIRED ) message(STATUS "Found Qt ${Qt5Core_VERSION}") +# 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 + # error \"No SSL support\" + #endif + int main() {}" + HAVE_SSL) +cmake_pop_check_state() + +if (NOT HAVE_SSL) + message(FATAL_ERROR "Quassel requires SSL support, but Qt is built with QT_NO_SSL") +endif() + +# Compat until fallback code paths have been disabled +add_definitions(-DHAVE_SSL) + # Optional Qt components find_package(Qt5LinguistTools QUIET) @@ -399,25 +418,6 @@ if (BUILD_TESTING) process_cmake_cxx_flags() 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 - # error \"No SSL support\" - #endif - int main() {}" - 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") - # Setup support for KDE Frameworks #####################################################################