CMake: Properly add lzma and gnurx to deployment

Author: Wohlstand

_common/deployment.cmake

@@ -95,6 +95,10 @@ function(pgeSetupQtDeploymet _is_static_qt _is_shared_mixer)
         find_mingw_dll(WINPTHREAD       "libwinpthread-1.dll" MINGW_DLLS "${MINGW_BIN_PATH}")
         find_mingw_dll(WINPTHREADGC3    "pthreadGC-3.dll" MINGW_DLLS "${MINGW_BIN_PATH}")
         find_mingw_dll(STDCPP           "libstdc++-6.dll" MINGW_DLLS "${MINGW_BIN_PATH}")
+        if(PGE_BUILD_XTCONVERT)
+            find_mingw_dll(LZMA5            "liblzma-5.dll" MINGW_DLLS "${MINGW_BIN_PATH}")
+            find_mingw_dll(GNURX            "libgnurx-0.dll" MINGW_DLLS "${MINGW_BIN_PATH}")
+        endif()
 
         message("MinGW DLLs: [${MINGW_DLLS}]")
 

_common/deployment_windows.cmake

@@ -63,6 +63,7 @@ if(SevenZipProgram)
         "libgcc*.dll"
         "libstdc*.dll"
     )
+    # DLLs variables formed at the deployment.dll, via the find_mingw_dll() macro
     if(MINGWDLL_MINGWEX)
         list(APPEND MinGW_BuiltDlls "libmingwex-0.dll")
     endif()
@@ -74,8 +75,13 @@ if(SevenZipProgram)
     endif()
 
     if(PGE_BUILD_XTCONVERT)
-        # XTConvert needs to supply the liblzma-5.dll
-        list(APPEND MinGW_BuiltDlls "liblzma-5.dll")
+        # XTConvert needs to supply the liblzma-5.dll and libgnurx-0.dll
+        if(MINGWDLL_LZMA5)
+            list(APPEND MinGW_BuiltDlls "liblzma-5.dll")
+        endif()
+        if(MINGWDLL_GNURX)
+            list(APPEND MinGW_BuiltDlls "libgnurx-0.dll")
+        endif()
     endif()
 
     set(PGE_CommonQtFiles)