]> git.lyx.org Git - features.git/commitdiff
cmake: also build merged on mac
authorPeter Kümmel <syntheticpp@gmx.net>
Sat, 8 Jan 2011 17:16:12 +0000 (17:16 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Sat, 8 Jan 2011 17:16:12 +0000 (17:16 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37152 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/src/support/CMakeLists.txt

index 4ff45876c8e57798941be338258afa06a06c4b95..8e66b497420d30f2ae97e90c2430dad79a32fdb1 100644 (file)
@@ -10,7 +10,7 @@ file(GLOB support_sources ${TOP_SRC_DIR}/src/support/${LYX_CPP_FILES})
 file(GLOB moc_files ${TOP_SRC_DIR}/src/support/${LYX_MOC_FILES})
 list(REMOVE_ITEM support_sources ${moc_files} .)
 if(APPLE)
-       list(APPEND support_sources ${TOP_SRC_DIR}/src/support/AppleSpeller.m)
+       list(APPEND dont_merge ${TOP_SRC_DIR}/src/support/AppleSpeller.m)
 endif()
 
 file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
@@ -38,7 +38,7 @@ else()
 endif()
 
 # needed to compile tex2lyx in merged mode
-set(dont_merge ${TOP_SRC_DIR}/src/support/gettext.cpp)
+set(dont_merge ${dont_merge} ${TOP_SRC_DIR}/src/support/gettext.cpp)
 
 lyx_add_msvc_pch(support)