piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 895 (#898)

Browse Source 
* Fix 895
  Create directory deployqt/AppRun

* Full path and quotes around paths

* Remove path as full path in variable

Co-authored-by: Runsys16 <rene.negre@orange.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
runsys
2021-10-13 08:24:18 +02:00
committed by GitHub
co-authored by Runsys16 Peter Feerick
parent 38aba6a8cc
commit aabce2cf26
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+12 -14
View File
@@ -550,25 +550,23 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
message(STATUS "linuxdeployqt will be downloaded")
set(LINUXDEPLOY_EXECUTABLE "${CMAKE_BINARY_DIR}/deployqt/AppRun")
set(LINUXDEPLOY_URL "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage")
set(LINUXDEPLOY_BUNDLE "linuxdeployqt.AppImage")
set(LINUXDEPLOY_BUNDLE "${CMAKE_BINARY_DIR}/linuxdeployqt.AppImage")
if (NOT EXISTS "${LINUXDEPLOY_EXECUTABLE}")
file(DOWNLOAD "${LINUXDEPLOY_URL}" "${LINUXDEPLOY_BUNDLE}")
execute_process(
COMMAND chmod +x "${LINUXDEPLOY_BUNDLE}"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
execute_process(
COMMAND "${LINUXDEPLOY_BUNDLE}" --appimage-extract
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
file(DOWNLOAD "${LINUXDEPLOY_URL}" ${LINUXDEPLOY_BUNDLE})
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/deployqt")
execute_process(
COMMAND chmod +x ${LINUXDEPLOY_BUNDLE}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
execute_process(
COMMAND ./${LINUXDEPLOY_BUNDLE} --appimage-extract
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/deployqt)
execute_process(
COMMAND mv squashfs-root deployqt
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
file(REMOVE ${CMAKE_BINARY_DIR}/${LINUXDEPLOY_BUNDLE})
COMMAND mv "${CMAKE_BINARY_DIR}/squashfs-root" deployqt
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}")
file(REMOVE "${LINUXDEPLOY_BUNDLE}")
endif()
endif()