Author: kuemmel
Date: Thu May 12 23:25:56 2011
New Revision: 38730
URL: http://www.lyx.org/trac/changeset/38730
Log:
cmake on mac: build with internal libintl, cleanup
Modified:
lyx-devel/trunk/intl/CMakeLists.txt
lyx-devel/trunk/src/CMakeLists.txt
Modified: lyx-devel/trunk/intl/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/intl/CMakeLists.txt Thu May 12 23:11:35 2011 (r38729)
+++ lyx-devel/trunk/intl/CMakeLists.txt Thu May 12 23:25:56 2011 (r38730)
@@ -50,8 +50,7 @@
endif()
add_library(intl STATIC ${intl_sources} ${intl_headers})
-set(LIBINTL_LIBRARIES intl)
-add_custom_target(intl_target DEPENDS intl)
+set(LIBINTL_LIBRARIES intl CACHE STRING "libintl library" FORCE)
if(ICONV_FOUND)
target_link_libraries(intl ${ICONV_LIBRARY})
Modified: lyx-devel/trunk/src/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/CMakeLists.txt Thu May 12 23:11:35 2011 (r38729)
+++ lyx-devel/trunk/src/CMakeLists.txt Thu May 12 23:25:56 2011 (r38730)
@@ -127,17 +127,11 @@
frontend_qt4
graphics
support
+ ${LIBINTL_LIBRARIES}
${ICONV_LIBRARY}
${QT_QTMAIN_LIBRARY}
${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)
target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
