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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8d10e6531..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()
@@ -103,10 +103,6 @@ lyx_find_info_files(LyXCMakeFiles ${TOP_MODULE_PATH}/*)
 lyx_find_info_files(LyXCMakeFiles ${TOP_SCRIPT_PATH}/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
-if (APPLE AND LYX_BUNDLE)
-        include(../Install)
-endif()
-
 add_executable(${_lyx}
 	${WIN32_CONSOLE}
 	${LYX_BUILD_BUNDLE}
@@ -123,35 +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
-	${intl_link}
 	${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)
@@ -165,29 +157,32 @@ if(MINGW)
 	target_link_libraries(${_lyx} ole32)
 endif()
 
-project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
+if(CYGWIN)
+	target_link_libraries(${_lyx} gdi32 shlwapi ole32)
+endif()
 
+project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
-install(TARGETS ${_lyx}
-	RUNTIME DESTINATION bin
-	BUNDLE DESTINATION .)
+install(TARGETS ${_lyx} 
+    BUNDLE DESTINATION . COMPONENT Runtime
+    RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime)
 
 if(LYX_BUNDLE)
-	if(NOT APPLE)
-		set(installed_lyx ${CMAKE_INSTALL_PREFIX}/bin/${_lyx}${CMAKE_EXECUTABLE_SUFFIX})
-	else()
+	if(APPLE)
+		# Now that lyx executable is defined, we can the files that should be included
+		# directly in the bundle. Note that resources are not copied with this mechanism:
+		# only the files necessary to run the executable are processed here (LyX.sdef, LyX.icns, etc.)
+		list(LENGTH OSX_BUNDLE_FILES OSX_BUNDLE_LAST_INDEX)
+		math(EXPR OSX_BUNDLE_LAST_INDEX "${OSX_BUNDLE_LAST_INDEX} - 1")
+		foreach(_i RANGE ${OSX_BUNDLE_LAST_INDEX})
+		    list(GET OSX_BUNDLE_FILES ${_i} _file)
+		    list(GET OSX_BUNDLE_DIRS ${_i} _directory)
+		    # Sets the location of the file into the OS X bundle
+			set_source_files_properties("${_file}" PROPERTIES MACOSX_PACKAGE_LOCATION "${_directory}")
+		endforeach()
+
 		set_target_properties(${_lyx} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/../Info.plist")
-		set(installed_lyx ${CMAKE_INSTALL_PREFIX}/${_lyx}.app)
-		set(LYX_BUNDLE_PROPERTY_MODE "ON")
-		include("../Install")
 	endif()
-	install(CODE "include(BundleUtilities)
-			fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
 endif()
 
-if(NOT APPLE)
-  # unresoved handling for multiple definitions
-  # APPLE can be enabled, if the hack in src/support/tests/dummy_functions.cp
-  # which requires multiple definitions is resolved. (Georg)
-  add_subdirectory(tests)
-endif()
+add_subdirectory(tests)