X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FCMakeLists.txt;h=95535e0a61707495d26871db21f8eff45a56e221;hb=242f543e01a5ddc0de3f0d041e412311463c8baa;hp=f0668287478fe9f3b648975f0b2be030a104979e;hpb=eef204ca33f09287f89e6abaa79fd00a663708c6;p=lyx.git

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index f066828747..95535e0a61 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -14,34 +14,29 @@ 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" 
-	${ZLIB_INCLUDE_DIR}
-	${LIBINTL_INCLUDE_DIR})
-
-if(LYX_MERGE_FILES)
-	set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
-endif()
+include_directories(BEFORE
+	"${TOP_SRC_DIR}/src/client"
+	"${TOP_SRC_DIR}/3rdparty/boost"
+	${ZLIB_INCLUDE_DIR})
 
 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})
 
-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})