Revert "Unduplicate pkgconfig library in hime_im_client"
This reverts commit 2d8bd57e22.
This commit is contained in:
parent
f05e28c8da
commit
6fa0e8df72
1 changed files with 24 additions and 7 deletions
31
external/hime_qt/hime_im_client/CMakeLists.txt
vendored
31
external/hime_qt/hime_im_client/CMakeLists.txt
vendored
|
|
@ -54,12 +54,29 @@ else()
|
|||
CLIENT_LIB=1
|
||||
)
|
||||
|
||||
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
|
||||
pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
|
||||
pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
|
||||
|
||||
target_link_libraries(external_hime_im_client
|
||||
PRIVATE
|
||||
PkgConfig::X11
|
||||
PkgConfig::GLIB2
|
||||
)
|
||||
target_link_libraries(external_hime_im_client
|
||||
PRIVATE
|
||||
PkgConfig::X11
|
||||
PkgConfig::GLIB2
|
||||
)
|
||||
else()
|
||||
pkg_check_modules(X11 REQUIRED x11)
|
||||
pkg_check_modules(GLIB2 REQUIRED glib-2.0)
|
||||
|
||||
target_include_directories(external_hime_im_client
|
||||
PRIVATE
|
||||
${X11_INCLUDE_DIRS}
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
target_link_libraries(external_hime_im_client
|
||||
PRIVATE
|
||||
X11
|
||||
glib-2.0
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue