App: modify CMakeLists to CMAKE_INSTALL_DATADIR

Author: KangLin

.github/workflows/android.yml

@@ -224,6 +224,7 @@ jobs:
                   -DCMAKE_VERBOSE_MAKEFILE=ON \
                   -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
                   -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+                  -DCMAKE_MAKE_PROGRAM=ninja \
                   -DVCPKG_VERBOSE=ON \
                   -DVCPKG_TRACE_FIND_PACKAGE=ON \
                   -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \

App/Client/CMakeLists.txt

@@ -128,15 +128,15 @@ if(WIN32)
             COMPONENT Application)
 elseif(APPLE)
     if(WITH_MACOSX_BUNDLE)
-    # 设置 bundle 属性 (如果是 GUI 应用)
-    # See: https://developer.apple.com/documentation/bundleresources/information-property-list
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        MACOSX_BUNDLE_GUI_IDENTIFIER "${APP_ID}"
-        MACOSX_BUNDLE_ICON_FILE "${APP_ID}.icns"
-        MACOSX_BUNDLE_BUNDLE_NAME "RabbitRemoteControl"
-        MACOSX_BUNDLE_BUNDLE_VERSION "${RabbitRemoteControl_VERSION}"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "${RabbitRemoteControl_VERSION}"
-        )
+        # 设置 bundle 属性 (如果是 GUI 应用)
+        # See: https://developer.apple.com/documentation/bundleresources/information-property-list
+        set_target_properties(${PROJECT_NAME} PROPERTIES
+            MACOSX_BUNDLE_GUI_IDENTIFIER "${APP_ID}"
+            MACOSX_BUNDLE_ICON_FILE "${APP_ID}.icns"
+            MACOSX_BUNDLE_BUNDLE_NAME "RabbitRemoteControl"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${RabbitRemoteControl_VERSION}"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "${RabbitRemoteControl_VERSION}"
+            )
     else()
         configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Resource/App.Info.plist
             ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
@@ -149,25 +149,24 @@ elseif(UNIX AND NOT ANDROID)
     configure_file(${CMAKE_SOURCE_DIR}/share/applications/${APP_ID}.desktop.in
         ${CMAKE_BINARY_DIR}/${APP_ID}.desktop)
     INSTALL(FILES ${CMAKE_BINARY_DIR}/${APP_ID}.desktop
-        DESTINATION share/applications
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
             COMPONENT Application)
     # INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/applications/RabbitRemoteControl.sh
     #         DESTINATION ${CMAKE_INSTALL_BINDIR}
     #             COMPONENT Application)
-    # Icon path
+    # Icon path: http://freedesktop.org/wiki/Standards/icon-theme-spec
     # The freedesktop.org standard specifies in which order and directories programs should look for icons:
     #
     #    $HOME/.icons (for backwards compatibility)
     #    $XDG_DATA_DIRS/icons
     #    /usr/share/pixmaps
     #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons/rabbit-green/svg/app.svg
-    #    DESTINATION share/pixmaps
+    #    DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps
     #        COMPONENT Application
     #    RENAME ${APP_ID}.svg)
-
     # Flatpak: https://docs.flatpak.org/en/latest/conventions.html#application-icons
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons/rabbit-green/svg/app.svg
-        DESTINATION share/icons/hicolor/scalable/apps
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
             COMPONENT Application
         RENAME ${APP_ID}.svg)
 

Script/install_appimage.sh

@@ -95,14 +95,14 @@ if [ $INSTALL_DIR != $ROOT_DIR ]; then
 fi
 
 # 修改执行文件
-sed -i "s#Exec=.*#Exec=${APPIMAGE_FILE}#g" $INSTALL_DIR/$APP_ID.desktop
+sed -i "s#Exec=.*#Exec=$INSTALL_DIR/${APPIMAGE_FILE}#g" $INSTALL_DIR/$APP_ID.desktop
 # 修改路径
 sed -i "s#Path=.*#Path=${INSTALL_DIR}#g" $INSTALL_DIR/$APP_ID.desktop
 if [ ! -f $DESKTOP_FILE ]; then
     CREATE_DESKTOP_FILE=1
     ln -s ${INSTALL_DIR}/$APP_ID.desktop $DESKTOP_FILE
-    # ICON 使用绝对路径。因为已修改了 Path，所以此处可以不用修改
-    #sed -i "s#^Icon=.*#Icon=$INSTALL_DIR/$APP_ID.svg#" $INSTALL_DIR/$APP_ID.desktop
+    # ICON 使用绝对路径
+    sed -i "s#^Icon=.*#Icon=$INSTALL_DIR/$APP_ID.svg#" $INSTALL_DIR/$APP_ID.desktop
 fi
 
 echo "echo \"Uninstall \\\"Rabbit Remote Control\\\" AppImage from \\\"$(dirname $(readlink -f $DESKTOP_FILE))\\\"\"" > $INSTALL_DIR/uninstall.sh