Fix FindLibKKC

1. pc name is not libkkc, but kkc-1.0
2. error when pc failed.
3. fix the link/compile options and cleanup

Author: wengxt

CMakeLists.txt

@@ -16,9 +16,6 @@ find_package(PkgConfig REQUIRED)
 find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
 find_package(LibKKC REQUIRED)
 find_package(Gettext REQUIRED)
-pkg_check_modules(Gee IMPORTED_TARGET "gee-0.8" REQUIRED)
-pkg_check_modules(JSonGlib IMPORTED_TARGET "json-glib-1.0" REQUIRED)
-pkg_check_modules(GObject2 IMPORTED_TARGET "gobject-2.0" REQUIRED)
 
 if (ENABLE_QT)
     set(QT_MAJOR_VERSION 6)

cmake/FindLibKKC.cmake

@@ -17,38 +17,39 @@
 # use pkg-config to get the directories and then use these values
 # in the find_path() and find_library() calls
 find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LibKKC QUIET libkkc)
+pkg_check_modules(PC_LibKKC QUIET kkc-1.0)
 
 find_path(LIBKKC_INCLUDE_DIR NAMES libkkc/libkkc.h
    HINTS
-   ${PC_LIBKKC_INCLUDEDIR}
-   ${PC_LIBKKC_INCLUDE_DIRS}
+   ${PC_LibKKC_INCLUDEDIR}
+   ${PC_LibKKC_INCLUDE_DIRS}
    )
 
 find_library(LIBKKC_LIBRARIES NAMES kkc
    HINTS
-   ${PC_LIBKKC_LIBDIR}
-   ${PC_LIBKKC_LIBRARY_DIRS}
+   ${PC_LibKKC_LIBDIR}
+   ${PC_LibKKC_LIBRARY_DIRS}
    )
 
-if(PC_LIBKKC_VERSION)
-    set(LIBKKC_VERSION_STRING ${PC_LIBKKC_VERSION})
+if(PC_LibKKC_FOUND)
+    set(LIBKKC_VERSION_STRING ${PC_LibKKC_VERSION})
 endif()
 
 # handle the QUIETLY and REQUIRED arguments and set LIBKKC_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LibKKC
-                                  REQUIRED_VARS LIBKKC_LIBRARIES LIBKKC_INCLUDE_DIR
+                                  REQUIRED_VARS LIBKKC_VERSION_STRING LIBKKC_LIBRARIES LIBKKC_INCLUDE_DIR
                                   VERSION_VAR LIBKKC_VERSION_STRING)
 
 mark_as_advanced(LIBKKC_INCLUDE_DIR LIBKKC_LIBRARIES)
 
 if (LIBKKC_FOUND AND NOT TARGET LibKKC::LibKKC)
-    add_library(LibKKC::LibKKC UNKNOWN IMPORTED)
+    add_library(LibKKC::LibKKC INTERFACE IMPORTED)
     set_target_properties(LibKKC::LibKKC PROPERTIES
-        IMPORTED_LOCATION "${LIBKKC_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBKKC_INCLUDE_DIR}"
+        INTERFACE_COMPILE_OPTIONS "${PC_LibKKC_CFLAGS}"
+        INTERFACE_LINK_OPTIONS "${PC_LibKKC_LDFLAGS_OTHER}"
+        INTERFACE_LINK_LIBRARIES "${PC_LibKKC_LINK_LIBRARIES}"
     )
 endif()
 

gui/CMakeLists.txt

@@ -28,7 +28,7 @@ target_link_libraries(fcitx5-kkc-config
   Qt${QT_MAJOR_VERSION}::Core
   Qt${QT_MAJOR_VERSION}::Widgets
   Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons
-  LibKKC::LibKKC PkgConfig::GObject2 PkgConfig::JSonGlib PkgConfig::Gee
+  LibKKC::LibKKC
   )
 
 install(TARGETS fcitx5-kkc-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/fcitx5/qt${QT_MAJOR_VERSION})

src/CMakeLists.txt

@@ -2,7 +2,7 @@ set(KKC_SOURCES
     kkc.cpp
 )
 add_fcitx5_addon(kkc ${KKC_SOURCES})
-target_link_libraries(kkc Fcitx5::Core Fcitx5::Config LibKKC::LibKKC PkgConfig::GObject2 PkgConfig::JSonGlib PkgConfig::Gee)
+target_link_libraries(kkc Fcitx5::Core Fcitx5::Config LibKKC::LibKKC)
 target_include_directories(kkc PRIVATE ${PROJECT_BINARY_DIR})
 set_target_properties(kkc PROPERTIES PREFIX "")
 install(TARGETS kkc DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")