Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd93a0ae70d6423cd22d00dc7dbe8f85d1dc29cd..ac0ca1a70fb0cda54d3a79fc1491fb0284b96337 100644 (file)
--- 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)
@@ -88,16 +90,17 @@ if (LYX_VLD)
 endif()
 
 if(WIN32)
-       set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc)
+       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
 
 lyx_find_info_files(LyXInfoFiles ${TOP_SRC_DIR}/*)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.txt)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.cmake)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.h)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.msvc)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/modules/*)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.txt)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.cmake)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.h)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.msvc)
+lyx_find_info_files(LyXCMakeFiles ${TOP_MODULE_PATH}/*)
+lyx_find_info_files(LyXCMakeFiles ${TOP_SCRIPT_PATH}/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
 if (APPLE AND LYX_BUNDLE)
@@ -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}