X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FCMakeLists.txt;h=39af9965cfab0ebf78e857c6df5ed089c2b3a2b8;hb=27f1f8a94857b147fcd5097351ec2fb070c2966e;hp=f0668287478fe9f3b648975f0b2be030a104979e;hpb=eef204ca33f09287f89e6abaa79fd00a663708c6;p=lyx.git

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index f066828747..39af9965cf 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -16,32 +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" 
-	${ZLIB_INCLUDE_DIR}
-	${LIBINTL_INCLUDE_DIR})
-
-if(LYX_MERGE_FILES)
-	set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
-endif()
+	"${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})