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

Cmake build: Add defines for HAVE_XCB_XCB_H and HAVE_LIBXCB

Browse Source
This commit is contained in:
Kornel Benko 2024-08-29 14:08:39 +02:00
parent b0a2aa5aa5
commit f1fddd86ef
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/ConfigureChecks.cmake
View File

@ -28,7 +28,7 @@ test_big_endian(WORDS_BIGENDIAN)
set(Include_Defines) set(Include_Defines)
foreach(_h_file aspell.h aspell/aspell.h limits.h locale.h foreach(_h_file aspell.h aspell/aspell.h limits.h locale.h
stdlib.h sys/stat.h sys/time.h sys/types.h sys/utime.h stdlib.h sys/stat.h sys/time.h sys/types.h sys/utime.h
sys/socket.h unistd.h inttypes.h utime.h string.h argz.h) sys/socket.h unistd.h inttypes.h utime.h string.h argz.h xcb/xcb.h)
string(REGEX REPLACE "[/\\.]" "_" _hf ${_h_file}) string(REGEX REPLACE "[/\\.]" "_" _hf ${_h_file})
string(TOUPPER ${_hf} _HF) string(TOUPPER ${_hf} _HF)
check_include_files(${_h_file} HAVE_${_HF}) check_include_files(${_h_file} HAVE_${_HF})

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

@ -91,10 +91,13 @@ ${Include_used_spellchecker}
// Define to 1 if enchant is version 2.x at least // Define to 1 if enchant is version 2.x at least
#cmakedefine HAVE_ENCHANT2 1 #cmakedefine HAVE_ENCHANT2 1
#endif // config.h guard // Define to 1 if have xcb library
#cmakedefine HAVE_LIBXCB ${HAVE_LIBXCB}
#define MYTHES_H_LOCATION <${MYTHES_DIR}/mythes.hxx> #define MYTHES_H_LOCATION <${MYTHES_DIR}/mythes.hxx>
#endif // config.h guard
// Unguarded cleanup of global namespace: // Unguarded cleanup of global namespace:
#ifdef ColorMode #ifdef ColorMode

1
src/CMakeLists.txt
View File

@ -148,7 +148,6 @@ if(QT_USES_X11)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
target_link_libraries(${_lyx} ${X11_X11_LIB}) # we need it because we use XSendEvent target_link_libraries(${_lyx} ${X11_X11_LIB}) # we need it because we use XSendEvent
if(HAVE_QT5_X11_EXTRAS) if(HAVE_QT5_X11_EXTRAS)
find_library(XCB_LIBRARY NAMES xcb)
if (XCB_LIBRARY MATCHES "NOTFOUND") if (XCB_LIBRARY MATCHES "NOTFOUND")
message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS") message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS")
endif() endif()