Amend b5416928. Cmake configuration for QT5.8

This commit is contained in:
Kornel Benko 2017-02-23 00:18:52 +01:00
parent f9ee47dfa2
commit c6314fc7d0

View File

@ -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 <QtCore/qconfig.h>
#include <${lyx_qt5_config}>
#include <string>
using namespace std;
string a(QT_QPA_DEFAULT_PLATFORM_NAME);