From: Peter Kümmel <syntheticpp@gmx.net>
Date: Thu, 15 Jul 2010 14:25:59 +0000 (+0000)
Subject: cmake: fix merged build
X-Git-Tag: 2.0.0~2982
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a24a1e3bfe9c19eeec7dfb1cab610248ce257338;p=features.git

cmake: fix merged build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34905 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 15d96cdcc6..4b28a25669 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -86,4 +86,9 @@
 #undef IN
 #endif
 
+#ifdef KeyPress
+#undef KeyPress
+#endif
+
+
 
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 3e1bd1ffd5..d2f4a90f5c 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -51,18 +51,21 @@ list(REMOVE_ITEM lyx_headers
 if (HUNSPELL_FOUND)
 	list(APPEND lyx_sources ${TOP_SRC_DIR}/src/HunspellChecker.cpp)
 	list(APPEND lyx_headers ${TOP_SRC_DIR}/src/HunspellChecker.h)
+	set(dont_merge ${dont_merge} ${TOP_SRC_DIR}/src/HunspellChecker.cpp)
 endif()
 
 if (ASPELL_FOUND)
 	include_directories(${ASPELL_INCLUDE_DIR})
 	list(APPEND lyx_sources ${TOP_SRC_DIR}/src/AspellChecker.cpp)
 	list(APPEND lyx_headers ${TOP_SRC_DIR}/src/AspellChecker.h)
+	set(dont_merge ${dont_merge} ${TOP_SRC_DIR}/src/AspellChecker.cpp)
 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)
+  set(dont_merge ${dont_merge} ${TOP_SRC_DIR}/src/EnchantChecker.cpp)
 endif()
 
 lyx_automoc(${TOP_SRC_DIR}/src/Compare.cpp)
@@ -77,8 +80,9 @@ lyx_add_msvc_pch(lyx)
 
 
 if (LYX_MERGE_FILES)
-	lyx_const_touched_files(_allinone  lyx_sources)
-	set(lyx_sources ${_allinone_files})
+	list(REMOVE_ITEM lyx_sources ${dont_merge})
+	lyx_const_touched_files(_allinone lyx_sources)
+	set(lyx_sources ${_allinone_files} ${dont_merge})
 endif()
 
 if (LYX_VLD)