X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=508456e4ee88ec00263bb4ee213d90c44a76cece;hb=d271c469e6d61005e45d22e7766f0bcb431c8327;hp=c162ec4f688865b7b481f176d21b27719466c586;hpb=4ce53949ab7d52a49ae79b8817bd3aa50fada0d1;p=quassel.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c162ec4f..508456e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,25 +333,6 @@ set_package_properties(Qt5LinguistTools PROPERTIES TYPE RECOMMENDED
     PURPOSE "Required for having translations"
 )
 
-# Some Qt5 versions do not define a target for lconvert, so we need to find it ourselves
-if (Qt5LinguistTools_FOUND)
-    if (NOT TARGET Qt5::lconvert AND TARGET Qt5::lrelease)
-        get_target_property(_lrelease_location Qt5::lrelease LOCATION)
-        get_filename_component(_lrelease_path ${_lrelease_location} PATH)
-        find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert-qt5 lconvert PATHS ${_lrelease_path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-    elseif(TARGET Qt5::lconvert AND NOT Qt5_LCONVERT_EXECUTABLE)
-        # Newer Qt5 versions define the target, but not the Qt5_LCONVERT_EXECUTABLE variable for some reason
-        get_target_property(QT_LCONVERT_EXECUTABLE Qt5::lconvert LOCATION)
-    endif()
-
-    # Compatibility with the Qt4 variables
-    set(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
-    set(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
-    if (Qt5_LCONVERT_EXECUTABLE)
-        set(QT_LCONVERT_EXECUTABLE ${Qt5_LCONVERT_EXECUTABLE})
-    endif()
-endif()
-
 # Non-Qt-based packages
 
 find_package(ZLIB REQUIRED)
@@ -371,16 +352,8 @@ 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}")
-
-if (Qt5_POSITION_INDEPENDENT_CODE)
-    set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
-endif()
-
+set(CMAKE_REQUIRED_LIBRARIES Qt5::Core)
 check_cxx_source_compiles("
     #include \"qglobal.h\"
     #if defined QT_NO_SSL
@@ -390,6 +363,11 @@ check_cxx_source_compiles("
     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")
+
 # Additional compile settings
 #####################################################################
 
@@ -450,19 +428,12 @@ include(QuasselInstallDirs)
 # Various config-dependent checks and settings
 #####################################################################
 
-if (HAVE_SSL)
-    add_definitions(-DHAVE_SSL)
-endif()
-add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
-
 # Check for syslog support
 if (NOT WIN32)
     check_include_file_cxx(syslog.h HAVE_SYSLOG)
     add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
 endif()
 
-add_feature_info("Qt Linguist Tools" QT_LCONVERT_EXECUTABLE "Translation support for Quassel")
-
 if (EMBED_DATA)
     message(STATUS "Embedding data files into the binary")
 else()