From c6314fc7d09e16768fb6df17d0a4ee4d51064106 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 23 Feb 2017 00:18:52 +0100 Subject: [PATCH] Amend b5416928. Cmake configuration for QT5.8 --- development/cmake/ConfigureChecks.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index 61190c8655..f09ba8bd92 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -216,9 +216,15 @@ if(LYX_USE_QT MATCHES "QT5") set(CMAKE_REQUIRED_INCLUDES ${Qt5Core_INCLUDE_DIRS}) set(CMAKE_REQUIRED_FLAGS) #message(STATUS "Qt5Core_INCLUDE_DIRS = ${Qt5Core_INCLUDE_DIRS}") + check_include_file_cxx(QtGui/qtgui-config.h HAVE_QTGUI_CONFIG_H) + if (HAVE_QTGUI_CONFIG_H) + set(lyx_qt5_config "QtGui/qtgui-config.h") + else() + set(lyx_qt5_config "QtCore/qconfig.h") + endif() check_cxx_source_runs( " - #include + #include <${lyx_qt5_config}> #include using namespace std; string a(QT_QPA_DEFAULT_PLATFORM_NAME); -- 2.39.2