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

Remove hard coded Qt selection when cross compiling for Windows

Browse Source
This commit is contained in:
Peter Kümmel 2015-10-23 15:14:09 +02:00
parent a685e5601c
commit 2aba6448a7
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -134,6 +134,7 @@ LYX_OPTION(BUNDLE "Build bundle (experimental) " OFF ALL)
LYX_OPTION(ENABLE_URLTESTS "Enable for URL tests" OFF ALL) LYX_OPTION(ENABLE_URLTESTS "Enable for URL tests" OFF ALL)
LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL) LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
LYX_OPTION(ASAN "Use address sanitizer" OFF ALL) LYX_OPTION(ASAN "Use address sanitizer" OFF ALL)
LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5)
# GCC specific # GCC specific
LYX_OPTION(PROFILE "Build profile version" OFF GCC) LYX_OPTION(PROFILE "Build profile version" OFF GCC)
@ -155,11 +156,6 @@ LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
# APPLE specific # APPLE specific
LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC) LYX_OPTION(DMG "Build as Mac bundle, needed for .dmg (experimental) " OFF MAC)
LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC) LYX_OPTION(COCOA "Use Cocoa on Mac" OFF MAC)
if(LYX_XMINGW)
LYX_COMBO(USE_QT "Use Qt version as frontend for MINGW" QT4)
else()
LYX_COMBO(USE_QT "Use Qt version as frontend" QT4 QT5)
endif()
if(help OR HELP) if(help OR HELP)