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

Cmake build: Check for QPA_XCB when QT_USES_X11 is known

Browse Source 
Since QT_USES_X11 is determined in ConfigureChecks
we have to check after this call
This commit is contained in:
Kornel Benko 2016-06-08 09:21:48 +02:00
parent 8a20f4b394
commit 8019732b39
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -568,7 +568,6 @@ if(LYX_XMINGW)
list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
endif()
set(QPA_XCB)
if(LYX_USE_QT MATCHES "QT5")
# set QPA_XCB if QT uses X11
find_package(Qt5Core REQUIRED)
@ -578,9 +577,6 @@ if(LYX_USE_QT MATCHES "QT5")
find_package(Qt5MacExtras REQUIRED)
endif()
find_package(Qt5X11Extras QUIET)
if(Qt5X11Extras_FOUND)
set(QPA_XCB 1)
endif()
find_package(Qt5WinExtras QUIET)
set(QTVERSION ${Qt5Core_VERSION})
macro (qt_use_modules)
@ -904,6 +900,11 @@ else()
configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
endif()
set(QPA_XCB)
if(Qt5X11Extras_FOUND AND QT_USES_X11)
# QPA_XCB is only valid if QT5+X11
set(QPA_XCB 1)
endif()
configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")