Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index f0668287478fe9f3b648975f0b2be030a104979e..10a972bf7cdcdbbc46b0047a7f351fff15e9a5ad 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -17,8 +17,7 @@ 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}
-       ${LIBINTL_INCLUDE_DIR})
+       ${ZLIB_INCLUDE_DIR})
 
 if(LYX_MERGE_FILES)
        set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
@@ -29,7 +28,6 @@ add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
 target_link_libraries(${_lyxclient}
        support
        ${Lyx_Boost_Libraries}
-       ${LIBINTL_LIBRARIES}
        ${ICONV_LIBRARY}
        ${QT_QTCORE_LIBRARY}
        ${QT_QTGUI_LIBRARY})
@@ -39,9 +37,15 @@ if(ASPELL_FOUND)
 endif()
 
 if(APPLE)
-       target_link_libraries(${_lyxclient} "-framework Carbon")
+       target_link_libraries(${_lyxclient} "-framework AppKit")
 endif()
 
+if(LYX_BUNDLE)
+       install(TARGETS ${_lyxclient}
+               RUNTIME DESTINATION bin
+               BUNDLE DESTINATION .)
+else()
+       install(TARGETS ${_lyxclient} DESTINATION bin)
+endif()
 
-install(TARGETS ${_lyxclient} DESTINATION bin)