[poppler] cmake/modules

Albert Astals Cid aacid at kemper.freedesktop.org
Thu Aug 31 13:37:44 UTC 2017


 cmake/modules/FindGLIB.cmake |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 26f64a2a34a9273897c34045ea7af5e8c3c603cb
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Aug 31 15:37:07 2017 +0200

    cmake: enable glib for windows too
    
    There's no need to not having it enabled

diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
index 35a9f9e7..a7d43fa6 100644
--- a/cmake/modules/FindGLIB.cmake
+++ b/cmake/modules/FindGLIB.cmake
@@ -13,11 +13,8 @@
 
 include(FindPackageHandleStandardArgs)
 
-if (NOT WIN32)
-  find_package(PkgConfig REQUIRED)
+find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
+pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
 
-  find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)
-
-endif(NOT WIN32)
+find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)


More information about the poppler mailing list