On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / CMakeLists.txt

diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt
index dfa969e33da510382a7a0e4c634fa34963921e54..bc7e2127cc2dff68f17b218d85cd40a82b90f79f 100644 (file)
--- a/src/frontends/qt4/CMakeLists.txt
+++ b/src/frontends/qt4/CMakeLists.txt
@@ -30,10 +30,11 @@ add_custom_command(
                -DIMAGES_DIR=${TOP_SRC_DIR}/lib/images
                -DRESOURCE_NAME=${resource_name}
                -DMAPPED_DIR=${TOP_SRC_DIR}/lib/
+                -DSUFFIX=${LYX_INSTALL_SUFFIX}
                -P ${TOP_SCRIPT_PATH}/LyXCreateImagesResource.cmake
        )
 
-qt4_add_resources(resource_files ${resource_name})
+qt_add_resources(resource_files ${resource_name})
 
 add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND)
 
@@ -52,8 +53,13 @@ if(LYX_MERGE_FILES)
 else()
        add_library(frontend_qt4 ${library_type} ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files} ${resource_files})
 endif()
+set_target_properties(frontend_qt4 PROPERTIES FOLDER "applications/LyX")
 
-
+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}
@@ -62,7 +68,7 @@ target_link_libraries(frontend_qt4
 lyx_add_gcc_pch(frontend_qt4)
 
 if(WIN32)
-       target_link_libraries(frontend_qt4 Gdi32)
+       target_link_libraries(frontend_qt4 gdi32)
 endif()
 
 project_source_group("${GROUP_CODE}" frontends_qt4_sources frontends_qt4_headers)