installer: further preparation

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b86fdc4265b487d8806476283fd3f35eefc587d..4ee7872d509434c2ebba912fc3e9cd7a293186a3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,9 @@ project(${_lyx})
 
 include_directories(${TOP_SRC_DIR}/src)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
+
 add_subdirectory(frontends)
 add_subdirectory(graphics)
 add_subdirectory(insets)
@@ -118,6 +121,10 @@ add_executable(${_lyx}
 
 add_dependencies(${_lyx} lyx_version)
 
+set_target_properties(${_lyx} PROPERTIES FOLDER "applications/LyX")
+
+qt_use_modules(${_lyx} Core Gui)
+
 lyx_add_gcc_pch(${_lyx})
 
 target_link_libraries(${_lyx}
@@ -127,7 +134,6 @@ target_link_libraries(${_lyx}
        frontend_qt4
        graphics
        support
-       ${intl_link}
        ${ICONV_LIBRARY}
        ${QT_QTMAIN_LIBRARY}
        ${vld_dll})
@@ -178,3 +184,9 @@ if(LYX_BUNDLE)
                        fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
 endif()
 
+if(NOT APPLE)
+  # unresoved handling for multiple definitions
+  # APPLE can be enabled, if the hack in src/support/tests/dummy_functions.cp
+  # which requires multiple definitions is resolved. (Georg)
+  add_subdirectory(tests)
+endif()