Use a more transparent lexic for bullet label functions

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

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 616ced668c006c2c667c5ca7bc3f11a05f9644fe..4108958836587a233963b1540e9575c7ae77fa27 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -14,38 +14,30 @@ file(GLOB _lyxclient_headers ${TOP_SRC_DIR}/src/client/*.h)
 list(REMOVE_ITEM _lyxclient_headers "${TOP_SRC_DIR}/src/client/pch.h")
 list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
 
-include_directories(BEFORE 
-       "${TOP_SRC_DIR}/src/client" 
-       "${TOP_SRC_DIR}/boost" 
+include_directories(BEFORE
+       "${TOP_SRC_DIR}/src/client"
+       "${TOP_SRC_DIR}/3rdparty/boost"
        ${ZLIB_INCLUDE_DIR})
 
-if(LYX_MERGE_FILES)
-       set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
-endif()
-
 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}
-       )
+       ${QT_QTGUI_LIBRARY})
 
-if(ASPELL_FOUND)
-       target_link_libraries(${_lyxclient} ${ASPELL_LIBRARY})
-endif()
+qt_use_modules(${_lyxclient} ${QtCore5CompatModule})
+lyx_target_link_libraries(${_lyxclient} Magic ASPELL)
 
 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(CYGWIN)
+       target_link_libraries(${_lyxclient} shlwapi)
 endif()
 
-install(TARGETS ${_lyxclient} DESTINATION bin)
+install(TARGETS ${_lyxclient} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})