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

Cmake: Allow test for X11 with QT5.6

Browse Source 
Used for key-test tests.
This commit is contained in:
Kornel Benko 2016-05-30 08:22:15 +02:00
parent dd0330c349
commit 7a86fe3e0b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/cmake/ConfigureChecks.cmake
View File

@ -192,7 +192,10 @@ if(LYX_USE_QT MATCHES "QT5")
get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop}) get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries}) set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries})
set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS})
set(CMAKE_REQUIRED_FLAGS ${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS}) set(CMAKE_REQUIRED_FLAGS "${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS} -fPIC -DQT_NO_VERSION_TAGGING")
#message(STATUS "CMAKE_REQUIRED_LIBRARIES = ${_x11extra_link_libraries}")
#message(STATUS "CMAKE_REQUIRED_INCLUDES = ${Qt5X11Extras_INCLUDE_DIRS}")
#message(STATUS "CMAKE_REQUIRED_FLAGS = ${CMAKE_REQUIRED_FLAGS}")
check_cxx_source_compiles( check_cxx_source_compiles(
" "
#include <QtX11Extras/QX11Info> #include <QtX11Extras/QX11Info>