anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 07:45:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix merged build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34905 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-15 14:25:59 +00:00
parent 5ff4c8826c
commit a24a1e3bfe
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/cmake/config.h.cmake
View File

@ -86,4 +86,9 @@
#undef IN
#endif
#ifdef KeyPress
#undef KeyPress
#endif

8
development/cmake/src/CMakeLists.txt
View File

@ -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)