commit 2da0d3277165bb8a6ea1049460c3a161f74017fc Author: Benjamin Piwowarski <benja...@bpiwowar.net> Date: Sun Mar 9 10:24:41 2014 +0100
CMake: specific modules for Qt5 diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index 14283ea..16d8b51 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -54,7 +54,11 @@ else() endif() set_target_properties(frontend_qt4 PROPERTIES FOLDER "applications/LyX") -qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent) +if(Qt5Core_FOUND AND APPLE) + qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent MacExtras) +else() + qt_use_modules(frontend_qt4 Core Gui Widgets Concurrent) +endif() target_link_libraries(frontend_qt4 frontends ${QT_QTCORE_LIBRARY} diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index 04eb38e..b0916b5 100644 --- a/src/support/CMakeLists.txt +++ b/src/support/CMakeLists.txt @@ -74,7 +74,11 @@ else() endif() set_target_properties(support PROPERTIES FOLDER "applications/LyX") -qt_use_modules(support Core) +if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND) + qt_use_modules(support Core Gui) +else() + qt_use_modules(support Core) +endif() target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})