X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fsrc%2FCMakeLists.txt;h=b19f21ab19f7fa690838577d6c54b1c09143afdc;hb=ef6de90bb5cba0dd1be05f1dec455166e92e6212;hp=763755f1703ba5afe18e66936525e377efe87929;hpb=fb3d47a14db907d62d0631d41fe60750df1423fe;p=lyx.git

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 763755f170..b19f21ab19 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -20,46 +20,86 @@ if (UNIX)
 endif()
 
 file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
+file(GLOB moc_files ${TOP_SRC_DIR}/src/${LYX_MOC_FILES})
+list(REMOVE_ITEM  lyx_sources ${moc_files} .)
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
 
 list(REMOVE_ITEM lyx_sources
-	${TOP_SRC_DIR}/src/ASpell.cpp
-	${TOP_SRC_DIR}/src/PSpell.cpp
-	${TOP_SRC_DIR}/src/ISpell.cpp
+	${TOP_SRC_DIR}/src/EnchantChecker.cpp
+	${TOP_SRC_DIR}/src/AspellChecker.cpp
+	${TOP_SRC_DIR}/src/HunspellChecker.cpp
 	${TOP_SRC_DIR}/src/Variables.cpp
-	${TOP_SRC_DIR}/src/Section.cpp)
+	${TOP_SRC_DIR}/src/Section.cpp
+	${TOP_SRC_DIR}/src/lyxcore.cpp)
+
+if(NOT APPLE)
+  list(REMOVE_ITEM lyx_sources
+    ${TOP_SRC_DIR}/src/AppleSpellChecker.cpp)
+   list(REMOVE_ITEM lyx_headers
+    ${TOP_SRC_DIR}/src/AppleSpellChecker.h)
+endif()
+
+list(REMOVE_ITEM lyx_headers
+	${TOP_SRC_DIR}/src/EnchantChecker.h
+	${TOP_SRC_DIR}/src/AspellChecker.h
+	${TOP_SRC_DIR}/src/HunspellChecker.h
+	${TOP_SRC_DIR}/src/Variables.h
+	${TOP_SRC_DIR}/src/Section.h)
+
+if (HUNSPELL_FOUND)
+	list(APPEND lyx_sources ${TOP_SRC_DIR}/src/HunspellChecker.cpp)
+	list(APPEND lyx_headers ${TOP_SRC_DIR}/src/HunspellChecker.h)
+endif()
 
 if (ASPELL_FOUND)
 	include_directories(${ASPELL_INCLUDE_DIR})
-	set(lyx_sources ${lyx_sources} ${TOP_SRC_DIR}/src/ASpell.cpp)
+	list(APPEND lyx_sources ${TOP_SRC_DIR}/src/AspellChecker.cpp)
+	list(APPEND lyx_headers ${TOP_SRC_DIR}/src/AspellChecker.h)
+endif()
+
+if (ENCHANT_FOUND)
+  include_directories("${ENCHANT_INCLUDE_DIR}")
+  list(APPEND lyx_sources ${TOP_SRC_DIR}/src/EnchantChecker.cpp)
+  list(APPEND lyx_headers ${TOP_SRC_DIR}/src/EnchantChecker.h)
+endif()
+
+lyx_automoc(${TOP_SRC_DIR}/src/Compare.cpp)
+if (WIN32)
+  lyx_automoc(${TOP_SRC_DIR}/src/Server.cpp)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}
-	${ZLIB_INCLUDE_DIR})
+	${ZLIB_INCLUDE_DIR} ${QT_INCLUDES})
 
 lyx_add_msvc_pch(lyx)
 
 
-if (NOT MERGE_FILES)
-	set(lyx_sources ${lyx_sources})
-else()
+if (LYX_MERGE_FILES)
 	lyx_const_touched_files(_allinone  lyx_sources)
 	set(lyx_sources ${_allinone_files})
 endif()
 
-if (LYX_LEAK_DETECTION)
+if (LYX_VLD)
 	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/vld.ini COPYONLY)
 	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt COPYONLY)
 	set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt)
 endif()
 
+if(WIN32)
+	set(FILE_RC ${CMAKE_SOURCE_DIR}/lyx.rc)
+	message(STATUS "Using icon defined in resource file: ${FILE_RC}")
+endif()
+
 add_executable(${_lyx}
 	${WIN32_CONSOLE}
 	${lyx_sources}
 	${lyx_headers}
 	${vld_files}
+	${FILE_RC}
 )
 
+lyx_add_gcc_pch(${_lyx})
+
 target_link_libraries(${_lyx}
 	mathed
 	insets
@@ -72,9 +112,15 @@ target_link_libraries(${_lyx}
 	${QT_QTMAIN_LIBRARY}
 	${vld_dll})
 
+if (HUNSPELL_FOUND)
+        target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
+endif()
 if (ASPELL_FOUND)
 	target_link_libraries(${_lyx} ${ASPELL_LIBRARY})
 endif()
+if (ENCHANT_FOUND)
+    target_link_libraries(${_lyx} ${ENCHANT_LIBRARY})
+endif()
 
 if (APPLE)
   target_link_libraries(${_lyx} "-bind_at_load")