Author: kornel
Date: Tue May 10 21:18:44 2011
New Revision: 38695
URL: http://www.lyx.org/trac/changeset/38695
Log:
In colaboration with Stephan Witt, adapted to our libintl to MAC
Modified:
lyx-devel/trunk/intl/CMakeLists.txt
lyx-devel/trunk/src/client/CMakeLists.txt
lyx-devel/trunk/src/tex2lyx/CMakeLists.txt
Modified: lyx-devel/trunk/intl/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/intl/CMakeLists.txt Tue May 10 20:34:39 2011 (r38694)
+++ lyx-devel/trunk/intl/CMakeLists.txt Tue May 10 21:18:44 2011 (r38695)
@@ -7,8 +7,8 @@
project(intl)
# libgnuintl.h.in => libintl.h
-configure_file(libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h COPYONLY)
-configure_file(libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h COPYONLY)
+configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h"
${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h COPYONLY)
+configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h"
${CMAKE_CURRENT_BINARY_DIR}/libintl.h COPYONLY)
add_definitions(
@@ -39,7 +39,7 @@
file(GLOB intl_headers ${TOP_SRC_DIR}/intl/*.h)
file(GLOB intl_sources RELATIVE "${TOP_SRC_DIR}/intl"
"${TOP_SRC_DIR}/intl/*.c")
-list(REMOVE_ITEM intl_sources vasnprintf.c version.c printf-parse.c
os2compat.c)
+list(REMOVE_ITEM intl_sources vasnprintf.c version.c printf-parse.c
os2compat.c intl-exports.c)
lyx_add_path(intl_sources ${TOP_SRC_DIR}/intl)
Modified: lyx-devel/trunk/src/client/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/client/CMakeLists.txt Tue May 10 20:34:39 2011
(r38694)
+++ lyx-devel/trunk/src/client/CMakeLists.txt Tue May 10 21:18:44 2011
(r38695)
@@ -42,5 +42,10 @@
target_link_libraries(${_lyxclient} "-framework Carbon")
endif()
+if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
+ target_link_libraries(${_lyxclient} intl)
+ add_dependencies(${_lyxclient} intl_target)
+endif()
+
install(TARGETS ${_lyxclient} DESTINATION bin)
Modified: lyx-devel/trunk/src/tex2lyx/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/CMakeLists.txt Tue May 10 20:34:39 2011
(r38694)
+++ lyx-devel/trunk/src/tex2lyx/CMakeLists.txt Tue May 10 21:18:44 2011
(r38695)
@@ -54,6 +54,11 @@
target_link_libraries(${_tex2lyx} "-framework Carbon")
endif()
+if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
+ target_link_libraries(${_tex2lyx} intl)
+ add_dependencies(${_tex2lyx} intl_target)
+endif()
+
project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
install(TARGETS ${_tex2lyx} DESTINATION bin)
