X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=eb350c1774ae418d0eee5c9b343fa1ef2f231478;hb=d8f6e65ec73e3a4aa4bfba510ee42dbe353e2742;hp=2fa3291c2d9ae695bb294bf15b14d2d9d4261695;hpb=080fca85a8fb6714afd7c34e4070687705fa1cb2;p=lyx.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2fa3291c2d..eb350c1774 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,7 +70,7 @@ if(WIN32)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}
-	${ZLIB_INCLUDE_DIR} ${QT_INCLUDES})
+	${ZLIB_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${QT_INCLUDES})
 
 lyx_add_msvc_pch(lyx)
 
@@ -119,33 +119,22 @@ add_dependencies(${_lyx} lyx_version)
 
 set_target_properties(${_lyx} PROPERTIES FOLDER "applications/LyX")
 
-qt_use_modules(${_lyx} Core Gui)
-
 lyx_add_gcc_pch(${_lyx})
 
 target_link_libraries(${_lyx}
 	mathed
 	insets
 	frontends
-	frontend_qt4
+	frontend_qt
 	graphics
 	support
 	${ICONV_LIBRARY}
-	${QT_QTMAIN_LIBRARY}
+	${LYX_QTMAIN_LIBRARY}
 	${vld_dll})
 
-if(HUNSPELL_FOUND)
-	target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
-endif()
-if(ASPELL_FOUND)
-	target_link_libraries(${_lyx} ${ASPELL_LIBRARY})
-endif()
-if(ENCHANT_FOUND)
-	target_link_libraries(${_lyx} ${ENCHANT_LIBRARY})
-endif()
-if(Magic_FOUND)
-	target_link_libraries(${_lyx} ${Magic_LIBRARY})
-endif()
+qt_use_modules(${_lyx} Core Gui)
+
+lyx_target_link_libraries(${_lyx} HUNSPELL ASPELL ENCHANT Magic)
 
 if(APPLE)
 	target_link_libraries(${_lyx} "-bind_at_load")
@@ -160,6 +149,10 @@ if(MINGW)
 	target_link_libraries(${_lyx} ole32)
 endif()
 
+if(CYGWIN)
+	target_link_libraries(${_lyx} gdi32 shlwapi ole32)
+endif()
+
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
 install(TARGETS ${_lyx}