cmake on mac: build with internal libintl, cleanup

[features.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8c016b82a1a12755ce21a81b086e05f62e56586..b920452369bff4e00c8ca346361bf49967d85c8d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,6 +76,11 @@ if (LYX_DEVEL_VERSION)
        add_definitions(-DDEVEL_VERSION)
 endif()
 
+if(APPLE)
+       list(APPEND dont_merge ${TOP_SRC_DIR}/src/TexRow.cpp)
+endif()
+
+
 if (LYX_MERGE_FILES)
        if(dont_merge)
                list(REMOVE_ITEM lyx_sources ${dont_merge})
@@ -122,14 +127,11 @@ target_link_libraries(${_lyx}
        frontend_qt4
        graphics
        support
+       ${LIBINTL_LIBRARIES}
        ${ICONV_LIBRARY}
        ${QT_QTMAIN_LIBRARY}
        ${vld_dll})
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  target_link_libraries(${_lyx} intl)
-  add_dependencies(${_lyx} intl_target)
-endif()
 
 if(HUNSPELL_FOUND)
        target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})