Cmake build:

[features.git] / src / client / CMakeLists.txt

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 616ced668c006c2c667c5ca7bc3f11a05f9644fe..33024378093cfd8f85d283bd1c5767a2b29cadd0 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -17,7 +17,8 @@ list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
 include_directories(BEFORE 
        "${TOP_SRC_DIR}/src/client" 
        "${TOP_SRC_DIR}/boost" 
-       ${ZLIB_INCLUDE_DIR})
+       ${ZLIB_INCLUDE_DIR}
+       ${LIBINTL_INCLUDE_DIR})
 
 if(LYX_MERGE_FILES)
        set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
@@ -28,24 +29,25 @@ add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
 target_link_libraries(${_lyxclient}
        support
        ${Lyx_Boost_Libraries}
-       ${LIBINTL_LIBRARIES}
+       ${intl_link}
        ${ICONV_LIBRARY}
        ${QT_QTCORE_LIBRARY}
-       ${QT_QTGUI_LIBRARY}
-       )
+       ${QT_QTGUI_LIBRARY})
 
 if(ASPELL_FOUND)
        target_link_libraries(${_lyxclient} ${ASPELL_LIBRARY})
 endif()
 
 if(APPLE)
-       target_link_libraries(${_lyxclient} "-framework Carbon")
+       target_link_libraries(${_lyxclient} "-framework AppKit")
 endif()
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  target_link_libraries(${_lyxclient} intl)
-  add_dependencies(${_lyxclient} intl_target)
+if(LYX_BUNDLE)
+       install(TARGETS ${_lyxclient}
+               RUNTIME DESTINATION bin
+               BUNDLE DESTINATION .)
+else()
+       install(TARGETS ${_lyxclient} DESTINATION bin)
 endif()
 
-install(TARGETS ${_lyxclient} DESTINATION bin)