From 5c1666c0e1370eb3ec5d0a5981684cc199810dcd Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Tue, 10 May 2011 19:18:44 +0000 Subject: [PATCH] In colaboration with Stephan Witt, adapted to our libintl to MAC git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38695 a592a061-630c-0410-9148-cb99ea01b6c8 --- intl/CMakeLists.txt | 6 +++--- src/client/CMakeLists.txt | 5 +++++ src/tex2lyx/CMakeLists.txt | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/intl/CMakeLists.txt b/intl/CMakeLists.txt index f80bb67524..1051110fee 100644 --- a/intl/CMakeLists.txt +++ b/intl/CMakeLists.txt @@ -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 @@ endif() 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) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index ce1d9faa21..616ced668c 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -42,5 +42,10 @@ if(APPLE) 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) diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index 7fbd12f7f6..448c3316a9 100644 --- a/src/tex2lyx/CMakeLists.txt +++ b/src/tex2lyx/CMakeLists.txt @@ -54,6 +54,11 @@ if(APPLE) 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) -- 2.39.5