From af35abe8975cd7d8cad95f2790ae10e4b4b75acc Mon Sep 17 00:00:00 2001 From: Serge Poltavski Date: Mon, 22 Apr 2019 23:40:40 +0300 Subject: [PATCH] win32: pkg-config find iconv added --- cmake/FindGLIB.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/FindGLIB.cmake b/cmake/FindGLIB.cmake index e93f5024cc..1c9561e89b 100644 --- a/cmake/FindGLIB.cmake +++ b/cmake/FindGLIB.cmake @@ -72,9 +72,10 @@ else() # search via pkg-config if(PKG_CONFIG_FOUND) pkg_check_modules(PKGCONFIG_GLIB glib-2.0 QUIET) pkg_check_modules(PKGCONFIG_GTHREAD gthread-2.0 QUIET) + pkg_check_modules(PKGCONFIG_ICONV iconv QUIET) endif() - if(PKGCONFIG_GLIB_FOUND AND PKGCONFIG_GTHREAD_FOUND) + if(PKGCONFIG_GLIB_FOUND AND PKGCONFIG_GTHREAD_FOUND AND PKGCONFIG_ICONV_FOUND) set(GLIB_CONFIG_INCLUDE_DIR ${PKGCONFIG_GLIB_INCLUDEDIR} ${PKGCONFIG_GLIB_INCLUDE_DIRS}) set(GLIB_INCLUDE_DIR ${PKGCONFIG_GLIB_INCLUDEDIR} ${PKGCONFIG_GLIB_INCLUDE_DIRS}) @@ -84,6 +85,8 @@ else() # search via pkg-config set(GTHREAD_INCLUDE_DIR ${PKGCONFIG_GTHREAD_INCLUDEDIR} ${PKGCONFIG_GTHREAD_INCLUDE_DIRS}) set(GTHREAD_LIBRARIES ${PKGCONFIG_GTHREAD_LIBRARIES}) set(GTHREAD_LIBRARY_DIRS ${PKGCONFIG_GTHREAD_LIBRARY_DIRS}) + + set(ICONV_INCLUDE_DIR ${PKGCONFIG_ICONV_INCLUDEDIR} ${PKGCONFIG_ICONV_INCLUDE_DIRS}) else() set(_include_paths ${INCLUDE_INSTALL_DIR}