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: Use LYX_USE_QT to determine if QT uses X11

Browse Source
This commit is contained in:
Kornel Benko 2014-06-12 07:52:45 +02:00
parent 2b0511510a
commit 207cd7a1b7
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/cmake/ConfigureChecks.cmake
View File

@ -112,6 +112,7 @@ check_cxx_source_compiles(
"
SIZEOF_WCHAR_T_IS_4)
if(LYX_USE_QT MATCHES "QT5")
if (Qt5X11Extras_FOUND)
get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
@ -127,7 +128,8 @@ if (Qt5X11Extras_FOUND)
}
"
QT_USES_X11)
elseif(QT4_FOUND)
endif()
elseif(LYX_USE_QT MATCHES "QT4")
set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY})
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
check_cxx_source_compiles(
@ -140,5 +142,7 @@ elseif(QT4_FOUND)
}
"
QT_USES_X11)
else()
message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
endif()