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

Amend 18c310a8 for cmake build: Get rid of QPA_XCB define

Browse Source
This commit is contained in:
Kornel Benko 2024-08-30 14:08:05 +02:00
parent 18c310a8cf
commit 8c14748e78
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -812,7 +812,6 @@ if(LYX_USE_QT MATCHES "QT6|QT5")
Qt5_wrap_ui(${ARGN})
endmacro()
endif()
# set QPA_XCB if QT uses X11
find_package(${QtVal}Core CONFIG REQUIRED)
if (${QtVal}Core_FOUND)
find_package(${QtVal}Widgets CONFIG REQUIRED)
@ -1186,6 +1185,7 @@ get_data_destination(dest_data)
list(APPEND tmp_vi " LyX files dir: ${CMAKE_INSTALL_PREFIX}/${dest_data}")
string(REPLACE ";" "\\n" VERSION_INFO "${tmp_vi}")
# the result XCB_LIBRARY will be used in src/CMakeLists.txt and also in configuring config.h
find_library(XCB_LIBRARY NAMES xcb)
if (XCB_LIBRARY)
set(HAVE_LIBXCB 1 CACHE BOOL "" FORCE)

5
development/cmake/ConfigureChecks.cmake
View File

@ -275,7 +275,6 @@ else()
endif()
endif()
set(QPA_XCB)
set(HAVE_QT5_X11_EXTRAS)
set(HAVE_QT6_X11_EXTRAS)
if (LYX_USE_QT MATCHES "QT5|QT6")
@ -312,10 +311,6 @@ if (LYX_USE_QT MATCHES "QT5|QT6")
}
"
QT_USES_X11)
if(QT_USES_X11 AND NOT LYX_USE_QT MATCHES "QT6")
set(QPA_XCB ${QT_USES_X11})
message(STATUS "Found QPA_XCB = ${QPA_XCB}")
endif()
endif()
if (${QtVal}X11Extras_FOUND)

3
development/cmake/config.h.cmake
View File

@ -64,9 +64,6 @@
#cmakedefine Z_PREFIX 1
// Defined if QT=QT5 uses X11
#cmakedefine QPA_XCB 1
// Define if you have the Qt5X11Extras module
#cmakedefine HAVE_QT5_X11_EXTRAS 1