diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,20 +188,19 @@ if (WIN32) install(FILES ${WINDOWS_INSTALL_LIBRARIES} DESTINATION bin) endif (WIN32) -# install menu item and icon +# prepare menu item and icon configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.desktop.in" "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.png" "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png" COPYONLY) +set(DESKTOP_FILE ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop) +set(ICON_FILE ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png) + +# install menu item and icon if (UNIX) - # first copy files to share/serialplot/ - install(FILES - ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop - DESTINATION share/applications/) - install(FILES - ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png - DESTINATION share/icons/hicolor/256x256/apps/) + install(FILES ${DESKTOP_FILE} DESTINATION share/applications/) + install(FILES ${ICON_FILE} DESTINATION share/icons/hicolor/256x256/apps/) endif (UNIX) # uninstalling diff --git a/cmake/modules/BuildLinuxAppImage.cmake b/cmake/modules/BuildLinuxAppImage.cmake --- a/cmake/modules/BuildLinuxAppImage.cmake +++ b/cmake/modules/BuildLinuxAppImage.cmake @@ -3,8 +3,7 @@ set(LINUXDEPLOYQT_URL "https://github.com/probonopd/linuxdeployqt/releases/download/1/linuxdeployqt-1-x86_64.AppImage") set(LINUXDEPLOYQT_TOOL ${CMAKE_CURRENT_BINARY_DIR}/linuxdeployqt-1-x86_64.AppImage) -set(APPIMAGE ${CMAKE_CURRENT_BINARY_DIR}/app/SerialPlot.AppImage) -set(APPIMAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/SerialPlot-${VERSION_STRING}) +set(APPIMAGE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROGRAM_NAME}-${VERSION_STRING}) add_custom_command( OUTPUT @@ -26,6 +25,10 @@ add_custom_target( COMMAND ${CMAKE_COMMAND} -E copy $ ${APPIMAGE_DIR} COMMAND + ${CMAKE_COMMAND} -E copy ${DESKTOP_FILE} ${APPIMAGE_DIR} + COMMAND + ${CMAKE_COMMAND} -E copy ${ICON_FILE} ${APPIMAGE_DIR} + COMMAND ${CMAKE_COMMAND} -E env PATH=${QT_INSTALL_PREFIX}/bin:$ENV{PATH} ${LINUXDEPLOYQT_TOOL} ${APPIMAGE_DIR}/${PROGRAM_NAME} -appimage -always-overwrite -bundle-non-qt-libs -verbose=2