grim/guifications3

bumped the glib dependency to >=2.26.0

2011-05-17, Gary Kramlich
2e22ea40b80f
Parents 4309f4d791be
Children 808b56734665
bumped the glib dependency to >=2.26.0
added a dep on GIO
2 files changed, 7 insertions(+), 4 deletions(-)
  • +4 -1
    gflib/CMakeLists.txt
  • +3 -3
    gflib/cmake/Modules/gflib.cmake
    • --- a/gflib/CMakeLists.txt Tue May 17 21:43:55 2011 -0500
    +++ b/gflib/CMakeLists.txt Tue May 17 22:15:25 2011 -0500
    @@ -6,17 +6,20 @@
    GFLIB_LIBRARY_PROJECT(gflib 0 0 1 dev)
    pkg_check_modules(GDS REQUIRED gds>=0.0.6)
    -pkg_check_modules(GMODULE REQUIRED gmodule-2.0>=2.16.0)
    +pkg_check_modules(GMODULE REQUIRED gmodule-2.0>=2.26.0)
    +pkg_check_modules(GIO REQUIRED gio-2.0>=2.26.0)
    include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
    ${GDS_INCLUDE_DIRS}
    + ${GIO_INCLUDE_DIRS}
    ${GMODULE_INCLUDE_DIRS}
    )
    link_directories(
    ${GDS_LIBRARY_DIRS}
    + ${GIO_LIBRARY_DIRS}
    ${GMODULE_LIBRARY_DIRS}
    )
    --- a/gflib/cmake/Modules/gflib.cmake Tue May 17 21:43:55 2011 -0500
    +++ b/gflib/cmake/Modules/gflib.cmake Tue May 17 22:15:25 2011 -0500
    @@ -13,9 +13,9 @@
    # look for glib and it's helper tools
    pkg_check_modules(GLIB REQUIRED
    - glib-2.0>=2.16.0
    - gobject-2.0>=2.16.0
    - gthread-2.0>=2.16.0
    + glib-2.0>=2.26.0
    + gobject-2.0>=2.26.0
    + gthread-2.0>=2.26.0
    )
    find_program(GLIB_GENMARSHAL