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

diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake
index 6983ccc32e..140072c8b9 100644
--- a/development/cmake/LyxPackaging.cmake
+++ b/development/cmake/LyxPackaging.cmake
@@ -41,32 +41,23 @@ elseif(WIN32)
     set(CPACK_GENERATOR ZIP)
     set(CPACK_BINARY_ZIP 1)
     if(MINGW)
-        get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
+        set(runtime)
         if(LYX_XMINGW)
-            if(LYX_USE_QT MATCHES "QT4")
-                get_filename_component(mingw_name ${LYX_XMINGW} NAME)
-                set(MINGW_BIN_PATH ${MINGW_BIN_PATH}/../${mingw_name}/lib)
-                set(MINGW_LIB_PATH ${MINGW_BIN_PATH})
-            else()
-                set(MINGW_BIN_PATH /usr/lib/gcc/${LYX_XMINGW}/${GCC_VERSION})
-                set(MINGW_LIB_PATH /usr/${LYX_XMINGW}/lib)
-            endif()
-        endif()
-        if(EXISTS ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
-            list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
-        elseif(EXISTS ${MINGW_BIN_PATH}/libgcc_s_seh-1.dll)
-            list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_seh-1.dll)
-        elseif(EXISTS ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll)
-            list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll)
-        endif()
-        if(EXISTS ${MINGW_BIN_PATH}/libstdc++-6.dll)
-            list(APPEND runtime ${MINGW_BIN_PATH}/libstdc++-6.dll)
-        endif()
-        if(EXISTS ${MINGW_LIB_PATH}/libwinpthread-1.dll)
-            list(APPEND runtime ${MINGW_LIB_PATH}/libwinpthread-1.dll)
+            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_BIN_PATH}")
+            message(FATAL_ERROR "No mingw runtime found in ${MINGW_RUNTIME_PATH}")
         endif()
 
         if(LYX_USE_QT MATCHES "QT5")
@@ -137,6 +128,7 @@ 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)
 
@@ -172,8 +164,13 @@ SET(CPACK_SOURCE_IGNORE_FILES
 "/\\\\.project$"
 "/\\\\.cproject$"
 "/\\\\.history$"
+"/\\\\.gitignore$"
+"/\\\\.gitattributes$"
 "\\\\.#"
 "\\\\.swp$"
+"\\\\.my$"
+"\\\\.pyc$"
+"\\\\.patch$"
 "~$"
 "/#"
 "/_CPack_Packages/"
@@ -197,7 +194,11 @@ SET(CPACK_SOURCE_IGNORE_FILES
 "/autom4te\\\\.cache/"
 "/\\\\.deps/"
 "/build/"
+"/attic/"
+"/HTML/"
 "/lyx-2\\\\."
+"/expectedTestFailures$"
+"/MergedManuals.lyx$"
 )
 
 if(LYX_CPACK)