Fix icon install path (#56)

* Fix install path

* Fix pack rpath

* Remove release related check on build only

Author: naokiri

.github/workflows/build_pass.yml

@@ -17,9 +17,6 @@ jobs:
         id: cskk_version
         run: |
           echo ::set-output name=cskk_version::`bin/cskk_version.sh`
-      - name: check fcitx5-cskk version exists in metainfo
-        run: |
-          bin/metainfo_version.sh
       - name: Download & install libcskk
         run: |
           wget https://github.com/naokiri/cskk/releases/download/v${{ steps.cskk_version.outputs.cskk_version }}/libcskk_${{ steps.cskk_version.outputs.cskk_version }}_amd64.deb

.github/workflows/release.yml

@@ -25,6 +25,8 @@ jobs:
     - name: check fcitx5-cskk version exists in metainfo
       run: |
         bin/metainfo_version.sh
+    - name: Check release tag matches version
+      run: test "refs/tags/v${{ steps.versions.outputs.version }}" = ${{ github.ref }}
     - name: Download & install libcskk
       run: |
         wget https://github.com/naokiri/cskk/releases/download/v${{ steps.cskk_version.outputs.cskk_version }}/libcskk_${{ steps.cskk_version.outputs.cskk_version }}_amd64.deb

CMakeLists.txt

@@ -1,8 +1,12 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0063 NEW)
-project(fcitx5-cskk VERSION 0.7.1)
+project(fcitx5-cskk VERSION 0.8.0)
 set(CMAKE_CXX_FLAGS "-Wall")
 set(CMAKE_CXX_STANDARD 17)
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    SET(CMAKE_INSTALL_PREFIX /usr CACHE PATH "Install directory for non-fcitx path stuffs" FORCE)
+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+message ("CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
 
 find_package(ECM 1.0.0 REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -11,12 +15,13 @@ include(GNUInstallDirs)
 include(ECMUninstallTarget)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-
+# See Fcitx5UtilsConfig.cmake
+add_definitions(-DFCITX_INSTALL_USE_FCITX_SYS_PATHS=ON)
 find_package(PkgConfig REQUIRED)
 find_package(Fcitx5Core 5.0.6 REQUIRED)
 find_package(Fcitx5Utils 5.0.6 REQUIRED)
 
-pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=0.9.0")
+pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=0.10.0")
 
 option(ENABLE_QT "Enable Qt for GUI configuration" On)
 
@@ -64,6 +69,9 @@ find_package(Gettext REQUIRED)
 add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-cskk\" -D_GNU_SOURCE)
 fcitx5_add_i18n_definition()
 
+# Don't remove RPATH on installing/packing so that fcitx can find cskk library
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(po)
@@ -74,7 +82,7 @@ add_subdirectory(gui)
 fcitx5_translate_desktop_file(
         org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml.in
         org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml XML)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.Addon.Cskk.metainfo.xml" DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

data/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Icon is not a fcitx component, so install in CMAKE_INSTALL_DATADIR
 foreach(size 24 32 48 256)
-    install(DIRECTORY icon/${size}x${size} DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor"
+    install(DIRECTORY icon/${size}x${size} DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor"
         PATTERN .* EXCLUDE
         PATTERN *~ EXCLUDE)
 endforeach(size 24 32 48 256)