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

diff --git a/intl/CMakeLists.txt b/intl/CMakeLists.txt
index f80bb67524c6921fdbb6af63f79f3c73511f2c4b..1051110feeca7fcea4dea609511c758c8dd346e0 100644 (file)
--- 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 ce1d9faa21d7cafb779cabc6e1f10c4cdcd62145..616ced668c006c2c667c5ca7bc3f11a05f9644fe 100644 (file)
--- 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 7fbd12f7f65901b399504f0694c4f09f45992beb..448c3316a973430897220abf618f9166d7fd9523 100644 (file)
--- 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)