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

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 4ab5f5aa8e..b19f21ab19 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -32,6 +32,13 @@ list(REMOVE_ITEM lyx_sources
 	${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
@@ -67,12 +74,12 @@ 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)