X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2FLyxPackaging.cmake;h=140072c8b955a3132dd19bf14d6bff4bff9e4f75;hb=bbf287a3c603b40e41007be54872e939b996319d;hp=385e59e691368decff5579680a58f632157ab59f;hpb=1bff751639b10af6c5f78e50dc43422d4f8db40d;p=lyx.git

diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 385e59e691..140072c8b9 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -6,6 +6,8 @@
 if(LYX_BUNDLE)
 	if(APPLE)
 		set(CPACK_GENERATOR DragNDrop)
+		set(CPACK_DMG_BACKGROUND_IMAGE "${TOP_CMAKE_PATH}/../MacOSX/dmg-background.png")
+		set(CPACK_DMG_DS_STORE "${CMAKE_BINARY_DIR}/ds_store/.DS_Store")
 	elseif(UNIX)
 		set(CPACK_GENERATOR STGZ)
 	elseif(WIN32)
@@ -32,7 +34,84 @@ FILE(STRINGS "${TOP_CMAKE_PATH}/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMA
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}")
 
-if (NOT WIN32)
+if (APPLE)
+	# We don't need absolute paths
+	set(CPACK_SET_DESTDIR "OFF")
+elseif(WIN32)
+    set(CPACK_GENERATOR ZIP)
+    set(CPACK_BINARY_ZIP 1)
+    if(MINGW)
+        set(runtime)
+        if(LYX_XMINGW)
+            execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-libgcc-file-name OUTPUT_VARIABLE GCC_LIBGCC OUTPUT_STRIP_TRAILING_WHITESPACE)
+            list(APPEND runtime /usr/${LYX_XMINGW}/lib/libwinpthread-1.dll)
+        else()
+            set(GCC_LIBGCC ${CMAKE_CXX_COMPILER})
+        endif()
+        get_filename_component(MINGW_RUNTIME_PATH ${GCC_LIBGCC} PATH)        
+        macro(add_runtime_dll _DLL)
+            file(GLOB GCC_RUNTIME ${MINGW_RUNTIME_PATH}/${_DLL})
+            list(APPEND runtime ${GCC_RUNTIME})
+        endmacro()
+        add_runtime_dll(libgcc*.dll)
+        add_runtime_dll(libstd*.dll)
+        add_runtime_dll(libwin*.dll)
+        if(NOT runtime)
+            message(FATAL_ERROR "No mingw runtime found in ${MINGW_RUNTIME_PATH}")
+        endif()
+
+        if(LYX_USE_QT MATCHES "QT5")
+            get_target_property(qmakebin Qt5::qmake IMPORTED_LOCATION)
+            get_filename_component(QT_BINARY_DIR ${qmakebin} PATH)
+            install(FILES
+                ${runtime}
+                ${QT_BINARY_DIR}/Qt5Core.dll
+                ${QT_BINARY_DIR}/Qt5Network.dll
+                ${QT_BINARY_DIR}/Qt5Gui.dll
+                ${QT_BINARY_DIR}/Qt5Widgets.dll
+                ${QT_BINARY_DIR}/Qt5Concurrent.dll
+                ${QT_BINARY_DIR}/Qt5OpenGL.dll
+                ${QT_BINARY_DIR}/Qt5PrintSupport.dll
+                ${QT_BINARY_DIR}/Qt5Svg.dll
+                ${QT_BINARY_DIR}/Qt5WinExtras.dll
+                DESTINATION bin
+                CONFIGURATIONS Release)
+            install(FILES
+                ${QT_BINARY_DIR}/../plugins/platforms/qminimal.dll
+                ${QT_BINARY_DIR}/../plugins/platforms/qwindows.dll
+                DESTINATION bin/platforms
+                CONFIGURATIONS Release)
+            install(FILES
+                ${QT_BINARY_DIR}/../plugins/printsupport/windowsprintersupport.dll
+                DESTINATION bin/printsupport
+                CONFIGURATIONS Release)
+            install(FILES
+                ${QT_BINARY_DIR}/../plugins/imageformats/qgif.dll
+                ${QT_BINARY_DIR}/../plugins/imageformats/qjpeg.dll
+                ${QT_BINARY_DIR}/../plugins/imageformats/qsvg.dll
+                ${QT_BINARY_DIR}/../plugins/imageformats/qico.dll
+                DESTINATION bin/imageformats
+                CONFIGURATIONS Release)
+            install(FILES
+                ${QT_BINARY_DIR}/../plugins/iconengines/qsvgicon.dll
+                DESTINATION bin/iconengines
+                CONFIGURATIONS Release)
+        else()
+            install(FILES
+                ${runtime}
+                ${QT_BINARY_DIR}/QtCore4.dll
+                ${QT_BINARY_DIR}/QtGui4.dll
+                ${QT_BINARY_DIR}/QtNetwork4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qgif4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qico4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qmng4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qsvg4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qtga4.dll
+                ${QT_PLUGINS_DIR}/imageformats/qtiff4.dll
+                DESTINATION bin CONFIGURATIONS Release)
+        endif()
+    endif()
+else()
 	# needed by rpm
 	set(CPACK_SET_DESTDIR "ON")
 endif()
@@ -49,12 +128,14 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.6)")
 
 # use dpkg-shlibdeps to generate additional info for package dependency list.
+set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
 
 #
 # for the next ones, cpack insists on data with values in some file
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_CMAKE_PATH}/LyX_description.txt")
-set(CPACK_RESOURCE_FILE_LICENSE "${TOP_CMAKE_PATH}/LyX_license.txt")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 
 # Use the revision number saved in ${LYX_PACKAGE_RELEASE}
 # as the release in rpm-package-build.
@@ -83,8 +164,13 @@ SET(CPACK_SOURCE_IGNORE_FILES
 "/\\\\.project$"
 "/\\\\.cproject$"
 "/\\\\.history$"
+"/\\\\.gitignore$"
+"/\\\\.gitattributes$"
 "\\\\.#"
 "\\\\.swp$"
+"\\\\.my$"
+"\\\\.pyc$"
+"\\\\.patch$"
 "~$"
 "/#"
 "/_CPack_Packages/"
@@ -108,7 +194,11 @@ SET(CPACK_SOURCE_IGNORE_FILES
 "/autom4te\\\\.cache/"
 "/\\\\.deps/"
 "/build/"
+"/attic/"
+"/HTML/"
 "/lyx-2\\\\."
+"/expectedTestFailures$"
+"/MergedManuals.lyx$"
 )
 
 if(LYX_CPACK)