grim/guifications3

finished up gflib.pc's transition
cmake
2010-03-21, Gary Kramlich
97b7f1e8fa7c
Parents 7c931e59eb94
Children 052776e3cf75
finished up gflib.pc's transition
2 files changed, 8 insertions(+), 2 deletions(-)
  • +7 -1
    gflib/CMakeLists.txt
  • +1 -1
    gflib/gflib.pc.in
    • --- a/gflib/CMakeLists.txt Sun Mar 21 15:41:22 2010 -0500
    +++ b/gflib/CMakeLists.txt Sun Mar 21 23:34:28 2010 -0500
    @@ -35,6 +35,12 @@
    set(GFLIB_MICRO_VERSION 1)
    set(GFLIB_EXTRA_VERSION dev)
    +if(GFLIB_EXTRA_VERSION)
    + set(VERSION ${GFLIB_MAJOR_VERSION}.${GFLIB_MINOR_VERSION}.${GFLIB_MICRO_VERSION}-${GFLIB_EXTRA_VERSION})
    +else(GFLIB_EXTRA_VERSION)
    + set(VERSION ${GFLIB_MAJOR_VERSION}.${GFLIB_MINOR_VERSION}.${GFLIB_MICRO_VERSION})
    +endif(GFLIB_EXTRA_VERSION)
    +
    ###############################################################################
    # subdirectories
    ###############################################################################
    @@ -68,5 +74,5 @@
    gmodule-2.0>=2.16.0
    )
    -configure_file(gflib.pc.in gflib.pc)
    +configure_file(gflib.pc.in gflib.pc @ONLY)
    --- a/gflib/gflib.pc.in Sun Mar 21 15:41:22 2010 -0500
    +++ b/gflib/gflib.pc.in Sun Mar 21 23:34:28 2010 -0500
    @@ -1,4 +1,4 @@
    -prefix=@prefix@
    +prefix=@CMAKE_INSTALL_PREFIX@
    exec_prefix=${prefix}
    libdir=${exec_prefix}/lib
    includedir=${prefix}/include/gflib-1.0