X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ffcb34debd9717f7401cb8584e75f4217be3b43d;hb=1f2d7f4db93aa76ae54e75efb52d9359b4ea289f;hp=526f37a556daad3b757160629cb0db558e2ca845;hpb=d863088986097e4d1cb286947225d9dd0e040615;p=lyx.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 526f37a556..ffcb34debd 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)
 
@@ -89,7 +89,7 @@ if (LYX_VLD)
 	lyx_add_info_files(VLD ${vld_files})
 endif()
 
-if(WIN32)
+if(WIN32 AND NOT MINGW)
 	set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
 	message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
@@ -119,34 +119,31 @@ 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})
+qt_use_modules(${_lyx} Core Gui)
+
+if(QT_HAS_X11_EXTRAS)
+  find_library(XCB_LIBRARY NAMES xcb)
+  if (XCB_LIBRARY MATCHES "NOTFOUND")
+    message(FATAL_ERROR "Need xcb library to use with QT5_X11_EXTRAS")
+  endif()
+  target_link_libraries(${_lyx} ${LYX_QT5_X11_EXTRAS_LIBRARY} ${XCB_LIBRARY})
 endif()
 
+lyx_target_link_libraries(${_lyx} HUNSPELL ASPELL ENCHANT Magic)
+
 if(APPLE)
 	target_link_libraries(${_lyx} "-bind_at_load")
 	if(LYX_COCOA)
@@ -160,11 +157,15 @@ 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} 
     BUNDLE DESTINATION . COMPONENT Runtime
-    RUNTIME DESTINATION bin COMPONENT Runtime)
+    RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime)
 
 if(LYX_BUNDLE)
 	if(APPLE)