X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3c737c7ba27e9f1fca91fd0c9282c8de6490fa29;hb=5608f6fdb67b86b4cf3d9215d24d7734239ad05a;hp=0a59f2dedc6ecd991decb849005e97ff80e0213e;hpb=0935f94f0d448c1a9b521e4825b30b94fe0521ff;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a59f2dedc..3c737c7ba2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
 LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ENABLE_KEYTESTS  "Enable for keytests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
-LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
+LYX_COMBO(USE_QT            "Use Qt version as frontend" AUTO QT4 QT5)
 #LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
 LYX_OPTION(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ON ALL)
 LYX_OPTION(EXTERNAL_ICONV   "OFF := Build 3rdparty lib iconvlib" ON ALL)
@@ -614,6 +614,23 @@ if(LYX_XMINGW)
 	list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
 
+set(min_qt5_version "5.6")
+if(LYX_USE_QT MATCHES "AUTO")
+	# try qt5 first
+	find_package(Qt5Core QUIET)
+	if(Qt5Core_FOUND)
+		set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version" FORCE)
+		message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+		if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
+			find_package(Qt4 "4.5.0" QUIET)
+			if(QT4_FOUND)
+				set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+			endif()
+		endif()
+	else()
+		set(LYX_USE_QT "QT4" CACHE STRING "Valid qt version" FORCE)
+	endif()
+endif()
 if(LYX_USE_QT MATCHES "QT5")
 	# set QPA_XCB if QT uses X11
 	find_package(Qt5Core REQUIRED)
@@ -625,10 +642,10 @@ if(LYX_USE_QT MATCHES "QT5")
 		find_package(Qt5X11Extras QUIET)
 		find_package(Qt5WinExtras QUIET)
 		set(QTVERSION ${Qt5Core_VERSION})
-		if (QTVERSION VERSION_LESS "5.4")
+		if (QTVERSION VERSION_LESS ${min_qt5_version})
 			message(STATUS "QTVERSION = \"${QTVERSION}\"")
 			message(STATUS "This version is not recommended, try either option -DLYX_USE_QT=QT4 or")
-			message(STATUS "install QT-Version >= \"5.4\"")
+			message(STATUS "install QT-Version >= \"${min_qt5_version}\"")
 			# see thread in lyx-devel list
 			# From: Jean-Pierre Chrétien <jeanpierre.chretien@free.fr>
 			# Date 11.03.2017