anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use guard for QT5/XCB also for cmake build.

Browse Source 
See commit d4428ceb81
from Enrico Forestieri
This commit is contained in:
Kornel Benko 2016-04-09 11:53:55 +02:00
parent 38bfc6a542
commit 4aa88e982a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -588,7 +588,9 @@ if(LYX_XMINGW)
list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR}) list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
endif() endif()
set(QPA_XCB)
if(LYX_USE_QT MATCHES "QT5") if(LYX_USE_QT MATCHES "QT5")
# set QPA_XCB if QT uses X11
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
@ -596,6 +598,9 @@ if(LYX_USE_QT MATCHES "QT5")
find_package(Qt5MacExtras REQUIRED) find_package(Qt5MacExtras REQUIRED)
endif() endif()
find_package(Qt5X11Extras QUIET) find_package(Qt5X11Extras QUIET)
if(Qt5X11Extras_FOUND)
set(QPA_XCB 1)
endif()
find_package(Qt5WinExtras QUIET) find_package(Qt5WinExtras QUIET)
set(QTVERSION ${Qt5Core_VERSION}) set(QTVERSION ${Qt5Core_VERSION})
macro (qt_use_modules) macro (qt_use_modules)