From 2d8bd57e22e552a5d51b089f7151c77e990e992f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 6 Aug 2020 16:24:44 +0400 Subject: [PATCH] Unduplicate pkgconfig library in hime_im_client Replace -Wno-error=register with -Wno-register in nimf_qt5 --- .../hime_qt/hime_im_client/CMakeLists.txt | 31 +++++-------------- external/nimf_qt5/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/external/hime_qt/hime_im_client/CMakeLists.txt b/external/hime_qt/hime_im_client/CMakeLists.txt index 72d7bea..75707f3 100644 --- a/external/hime_qt/hime_im_client/CMakeLists.txt +++ b/external/hime_qt/hime_im_client/CMakeLists.txt @@ -54,29 +54,12 @@ else() CLIENT_LIB=1 ) - if (DESKTOP_APP_USE_PACKAGED) - pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) - pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) + 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 - ) - 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() + target_link_libraries(external_hime_im_client + PRIVATE + PkgConfig::X11 + PkgConfig::GLIB2 + ) endif() diff --git a/external/nimf_qt5/CMakeLists.txt b/external/nimf_qt5/CMakeLists.txt index 98fbe59..989478f 100644 --- a/external/nimf_qt5/CMakeLists.txt +++ b/external/nimf_qt5/CMakeLists.txt @@ -54,6 +54,6 @@ else() target_compile_options(external_nimf_qt5 PRIVATE - -Wno-error=register + -Wno-register ) endif()