prepare Qt 5.6 builds

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

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index ce1d9faa21d7cafb779cabc6e1f10c4cdcd62145..39af9965cfab0ebf78e857c6df5ed089c2b3a2b8 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -16,31 +16,27 @@ list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp")
 
 include_directories(BEFORE 
        "${TOP_SRC_DIR}/src/client" 
-       "${TOP_SRC_DIR}/boost" 
+       "${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()
+lyx_target_link_libraries(${_lyxclient} Magic ASPELL)
 
 if(APPLE)
-       target_link_libraries(${_lyxclient} "-framework Carbon")
+       target_link_libraries(${_lyxclient} "-framework AppKit")
+endif()
+
+if(CYGWIN)
+       target_link_libraries(${_lyxclient} shlwapi)
 endif()
 
-install(TARGETS ${_lyxclient} DESTINATION bin)
+install(TARGETS ${_lyxclient} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})