anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +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

36
development/cmake/ConfigureChecks.cmake
View File

@ -112,22 +112,24 @@ check_cxx_source_compiles(
" "
SIZEOF_WCHAR_T_IS_4) SIZEOF_WCHAR_T_IS_4)
if (Qt5X11Extras_FOUND) if(LYX_USE_QT MATCHES "QT5")
get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS) if (Qt5X11Extras_FOUND)
get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop}) get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS)
set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries}) get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS}) set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries})
set(CMAKE_REQUIRED_FLAGS ${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS}) set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS})
check_cxx_source_compiles( set(CMAKE_REQUIRED_FLAGS ${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS})
" check_cxx_source_compiles(
#include <QtX11Extras/QX11Info> "
int main() #include <QtX11Extras/QX11Info>
{ int main()
bool isX11 = QX11Info::isPlatformX11(); {
} bool isX11 = QX11Info::isPlatformX11();
" }
QT_USES_X11) "
elseif(QT4_FOUND) QT_USES_X11)
endif()
elseif(LYX_USE_QT MATCHES "QT4")
set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${QT_QTGUI_LIBRARY})
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES}) set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
check_cxx_source_compiles( check_cxx_source_compiles(
@ -140,5 +142,7 @@ elseif(QT4_FOUND)
} }
" "
QT_USES_X11) QT_USES_X11)
else()
message(FATAL_ERROR "Check for QT_USES_X11: Not handled LYX_USE_QT (= ${LYX_USE_QT})")
endif() endif()