kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Unduplicate pkgconfig library in hime_im_client

Browse source 
Replace -Wno-error=register with -Wno-register in nimf_qt5
This commit is contained in:
Ilya Fedin 2020-08-06 16:24:44 +04:00 • committed by John Preston
parent 519cb81044
commit 2d8bd57e22
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
external/hime_qt/hime_im_client/CMakeLists.txt vendored
View file

@ -54,29 +54,12 @@ else()
CLIENT_LIB=1 CLIENT_LIB=1
) )
if (DESKTOP_APP_USE_PACKAGED) pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
target_link_libraries(external_hime_im_client target_link_libraries(external_hime_im_client
PRIVATE PRIVATE
PkgConfig::X11 PkgConfig::X11
PkgConfig::GLIB2 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() endif()

2
external/nimf_qt5/CMakeLists.txt vendored
View file

@ -54,6 +54,6 @@ else()
target_compile_options(external_nimf_qt5 target_compile_options(external_nimf_qt5
PRIVATE PRIVATE
-Wno-error=register -Wno-register
) )
endif() endif()