X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=4ee7872d509434c2ebba912fc3e9cd7a293186a3;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=dd9a3609abd62f5531b38630654e8d0b33bb1e86;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd9a3609ab..4ee7872d50 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,11 +4,13 @@
 # Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
 #
 
-set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 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)
@@ -119,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}
@@ -128,7 +134,6 @@ target_link_libraries(${_lyx}
 	frontend_qt4
 	graphics
 	support
-	${intl_link}
 	${ICONV_LIBRARY}
 	${QT_QTMAIN_LIBRARY}
 	${vld_dll})
@@ -179,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()