anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-08 18:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake on mac: build with internal libintl, cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38730 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-05-12 21:25:56 +00:00
parent 6a953f81ad
commit e481d312f0
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intl/CMakeLists.txt
View File

@ -50,8 +50,7 @@ if(ICONV_FOUND)
endif() endif()
add_library(intl STATIC ${intl_sources} ${intl_headers}) add_library(intl STATIC ${intl_sources} ${intl_headers})
set(LIBINTL_LIBRARIES intl) set(LIBINTL_LIBRARIES intl CACHE STRING "libintl library" FORCE)
add_custom_target(intl_target DEPENDS intl)
if(ICONV_FOUND) if(ICONV_FOUND)
target_link_libraries(intl ${ICONV_LIBRARY}) target_link_libraries(intl ${ICONV_LIBRARY})

8
src/CMakeLists.txt
View File

@ -127,17 +127,11 @@ target_link_libraries(${_lyx}
frontend_qt4 frontend_qt4
graphics graphics
support support
${LIBINTL_LIBRARIES}
${ICONV_LIBRARY} ${ICONV_LIBRARY}
${QT_QTMAIN_LIBRARY} ${QT_QTMAIN_LIBRARY}
${vld_dll}) ${vld_dll})
if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
# TODO remove, use LIBINTL_LIBRARIES
target_link_libraries(${_lyx} intl)
add_dependencies(${_lyx} intl_target)
else()
target_link_libraries(${_lyx} ${LIBINTL_LIBRARIES})
endif()
if(HUNSPELL_FOUND) if(HUNSPELL_FOUND)
target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY}) target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})