anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add QtMacExtras detection for Qt5 support

Browse Source
This commit is contained in:
Stephan Witt 2014-08-21 18:22:43 +02:00
parent 7b31da6793
commit 327da4f275
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@ -551,21 +551,25 @@ if(LYX_XMINGW)
list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR}) list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
endif() endif()
if(LYX_USE_QT MATCHES "QT5") if(LYX_USE_QT MATCHES "QT5")
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package(Qt5X11Extras) if(APPLE)
set(QTVERSION ${Qt5Core_VERSION}) find_package(Qt5MacExtras)
macro (qt_use_modules) elseif(UNIX)
qt5_use_modules(${ARGN}) find_package(Qt5X11Extras)
endmacro() endif()
macro (qt_add_resources) set(QTVERSION ${Qt5Core_VERSION})
qt5_add_resources(${ARGN}) macro (qt_use_modules)
endmacro() qt5_use_modules(${ARGN})
macro (qt_wrap_uifiles) endmacro()
qt5_wrap_ui(${ARGN}) macro (qt_add_resources)
endmacro() qt5_add_resources(${ARGN})
endif() endmacro()
macro (qt_wrap_uifiles)
qt5_wrap_ui(${ARGN})
endmacro()
endif()
elseif(LYX_USE_QT MATCHES "QT4") elseif(LYX_USE_QT MATCHES "QT4")
find_package(Qt4 "4.5.0" REQUIRED) find_package(Qt4 "4.5.0" REQUIRED)
macro (qt_use_modules) macro (qt_use_modules)

4
config/qt4.m4
View File

@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
done done
qt_cv_libname= qt_cv_libname=
for libname in $qt_guilibs \ for libname in $qt_guilibs \
'-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtGui'\ '-framework QtCore -framework QtConcurrent -framework QtWidgets -framework QtMacExtras -framework QtGui'\
'-framework QtCore -framework QtGui' '-framework QtCore -framework QtGui'
do do
QT_TRY_LINK($libname) QT_TRY_LINK($libname)
@ -254,7 +254,7 @@ AC_DEFUN([QT_DO_MANUAL_CONFIG],
QT_CORE_LDFLAGS= QT_CORE_LDFLAGS=
if test -n "$qt_cv_includes"; then if test -n "$qt_cv_includes"; then
QT_INCLUDES="-I$qt_cv_includes" QT_INCLUDES="-I$qt_cv_includes"
for i in Qt QtCore QtGui QtWidgets QtConcurrent; do for i in Qt QtCore QtGui QtWidgets QtConcurrent QtMacExtras; do
QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i" QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
done done
QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore" QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"