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 8d05dcf51601b811e37da0e07888f00d795b2db0..bc7e2127cc2dff68f17b218d85cd40a82b90f79f 100644 (file)
--- a/src/frontends/qt4/CMakeLists.txt
+++ b/src/frontends/qt4/CMakeLists.txt
@@ -22,13 +22,19 @@ lyx_automoc(${frontends_qt4_sources})
 
 lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI})
 
-file(GLOB_RECURSE frontend_qt4_images_png      ${TOP_SRC_DIR}/lib/images/*.png)
-file(GLOB_RECURSE frontend_qt4_images_gif      ${TOP_SRC_DIR}/lib/images/*.gif)
 set(resource_name ${CMAKE_CURRENT_BINARY_DIR}/Resources.qrc)
-set(frontend_qt4_images ${frontend_qt4_images_png} ${frontend_qt4_images_gif})
-lyx_qt_resources_file(${resource_name} "${TOP_SRC_DIR}/lib/" frontend_qt4_images)
-qt4_add_resources(resource_files ${resource_name})
 
+add_custom_command(
+       OUTPUT  ${resource_name}
+       COMMAND ${CMAKE_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
+       )
+
+qt_add_resources(resource_files ${resource_name})
 
 add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND)
 
@@ -37,10 +43,6 @@ include_directories(
        ${QT_INCLUDES}
        ${CMAKE_CURRENT_BINARY_DIR})
 
-if (LYX_DEVEL_VERSION)
-       add_definitions(-DDEVEL_VERSION)
-endif()
-
 if(LYX_MERGE_FILES)
        lyx_const_touched_files(_allinone frontends_qt4_sources)
        set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
@@ -51,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}
@@ -61,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)