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

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index ddcb5cde20..b19f21ab19 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -29,7 +29,15 @@ list(REMOVE_ITEM lyx_sources
 	${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
@@ -55,7 +63,10 @@ if (ENCHANT_FOUND)
   list(APPEND lyx_headers ${TOP_SRC_DIR}/src/EnchantChecker.h)
 endif()
 
-lyx_automoc(${TOP_SRC_DIR}/src/Compare.cpp ${TOP_SRC_DIR}/src/Server.cpp)
+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} ${QT_INCLUDES})
@@ -63,22 +74,28 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
 lyx_add_msvc_pch(lyx)
 
 
-if (MERGE_FILES)
+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})