grim/guifications3

added gds>=0.0.6 to our dependencies

2011-05-16, Gary Kramlich
41b8049834db
Parents 35f172415ece
Children df7cae2cbc35
added gds>=0.0.6 to our dependencies
2 files changed, 12 insertions(+), 2 deletions(-)
  • +11 -2
    gflib/CMakeLists.txt
  • +1 -0
    gflib/gflib/CMakeLists.txt
    • --- a/gflib/CMakeLists.txt Wed Dec 22 22:51:55 2010 -0600
    +++ b/gflib/CMakeLists.txt Mon May 16 20:22:03 2011 -0500
    @@ -5,9 +5,18 @@
    include(gflib)
    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)
    -include_directories(${GMODULE_INCLUDE_DIRS})
    -link_directories(${GMODULE_LIBRARY_DIRS})
    +
    +include_directories(
    + ${GDS_INCLUDE_DIRS}
    + ${GMODULE_INCLUDE_DIRS}
    +)
    +
    +link_directories(
    + ${GDS_LIBRARY_DIRS}
    + ${GMODULE_LIBRARY_DIRS}
    +)
    # Subdirectories
    add_subdirectory(gflib)
    --- a/gflib/gflib/CMakeLists.txt Wed Dec 22 22:51:55 2010 -0600
    +++ b/gflib/gflib/CMakeLists.txt Mon May 16 20:22:03 2011 -0500
    @@ -165,6 +165,7 @@
    target_link_libraries(gflib
    ${GLIB_LIBRARIES}
    + ${GDS_LIBRARIES}
    ${GMODULE_LIBRARIES}
    )