There is no sane reason for not using SSL in the year 2020, plus
every distro should be shipping the Qt libraries with SSL support
enabled. Thus, make it mandatory for Quassel, too.
Going forward, this allows us to remove lots of fallback code paths
that make the code much more complex in many places, and that have
not been tested (or even been built) in a long time.
)
message(STATUS "Found Qt ${Qt5Core_VERSION}")
)
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)
# Optional Qt components
find_package(Qt5LinguistTools QUIET)
process_cmake_cxx_flags()
endif()
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
#####################################################################
# Setup support for KDE Frameworks
#####################################################################
sessionthread.cpp
sqlauthenticator.cpp
sqlitestorage.cpp
sessionthread.cpp
sqlauthenticator.cpp
sqlitestorage.cpp
storage.cpp
# needed for automoc
storage.cpp
# needed for automoc
set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
endif()
set_property(SOURCE oidentdconfiggenerator.cpp APPEND PROPERTY COMPILE_DEFINITIONS HAVE_UMASK)
endif()
-if (HAVE_SSL)
- target_sources(${TARGET} PRIVATE sslserver.cpp)
-endif()
-
if (Ldap_FOUND)
target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
target_link_libraries(${TARGET} PRIVATE Ldap::Ldap)
if (Ldap_FOUND)
target_sources(${TARGET} PRIVATE ldapauthenticator.cpp)
target_link_libraries(${TARGET} PRIVATE Ldap::Ldap)
settingsdlg.cpp
settingspagedlg.cpp
simplenetworkeditor.cpp
settingsdlg.cpp
settingspagedlg.cpp
simplenetworkeditor.cpp
systemtray.cpp
systrayanimationnotificationbackend.cpp
systraynotificationbackend.cpp
systemtray.cpp
systrayanimationnotificationbackend.cpp
systraynotificationbackend.cpp
settingsdlg.ui
settingspagedlg.ui
simplenetworkeditor.ui
settingsdlg.ui
settingspagedlg.ui
simplenetworkeditor.ui
systrayanimationconfigwidget.ui
topicwidget.ui
)
systrayanimationconfigwidget.ui
topicwidget.ui
)
Qt5::WebEngineWidgets)
endif()
Qt5::WebEngineWidgets)
endif()
-if (HAVE_SSL)
- target_sources(${TARGET} PRIVATE
- sslinfodlg.cpp
- sslinfodlg.ui
- )
-endif()
-
if (LibsnoreQt5_FOUND)
target_compile_definitions(${TARGET} PRIVATE -DHAVE_LIBSNORE)
target_sources(${TARGET} PRIVATE
if (LibsnoreQt5_FOUND)
target_compile_definitions(${TARGET} PRIVATE -DHAVE_LIBSNORE)
target_sources(${TARGET} PRIVATE