grim/guifications3

this should be working for a normal build right now, but ld is complaing that glib and friends aren't the right architecture
cmake
2010-03-20, Gary Kramlich
418cfa0646a9
Parents 92cc94ef1fda
Children dd777c35155f
this should be working for a normal build right now, but ld is complaing that glib and friends aren't the right architecture
3 files changed, 35 insertions(+), 0 deletions(-)
  • +14 -0
    gflib/CMakeLists.txt
  • +5 -0
    gflib/gflib/CMakeLists.txt
  • +16 -0
    gflib/po/CMakeLists.txt
    • --- a/gflib/CMakeLists.txt Sat Mar 20 18:55:24 2010 -0500
    +++ b/gflib/CMakeLists.txt Sat Mar 20 21:36:36 2010 -0500
    @@ -18,6 +18,18 @@
    ${GMODULE_INCLUDE_DIRS}
    )
    +link_directories(
    + ${GLIB_LIBRARY_DIRS}
    + ${GMODULE_LIBRARY_DIRS}
    +)
    +
    +add_definitions(
    + -DGETTEXT_PACKAGE="gflib"
    + -DDATADIR="${CMAKE_INSTALL_PREFIX}/share"
    + -DLIBDIR="${CMAKE_INSTALL_PREFIX}/lib"
    + -DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/locale"
    +)
    +
    set(GFLIB_MAJOR_VERSION 0)
    set(GFLIB_MINOR_VERSION 0)
    set(GFLIB_MICRO_VERSION 1)
    @@ -57,3 +69,5 @@
    )
    +message(${GLIB_LDFLAGS})
    +message(${GLIB_LIBRARY_DIRS})
    --- a/gflib/gflib/CMakeLists.txt Sat Mar 20 18:55:24 2010 -0500
    +++ b/gflib/gflib/CMakeLists.txt Sat Mar 20 21:36:36 2010 -0500
    @@ -123,3 +123,8 @@
    gf_type.c
    )
    +target_link_libraries(gflib
    + ${GLIB_LIBRARIES}
    + ${GMODULE_LIBRARIES}
    +)
    +
    --- a/gflib/po/CMakeLists.txt Sat Mar 20 18:55:24 2010 -0500
    +++ b/gflib/po/CMakeLists.txt Sat Mar 20 21:36:36 2010 -0500
    @@ -0,0 +1,16 @@
    +# vi:syntax=cmake
    +
    +if(ENABLE_NLS)
    + find_program(INTLTOOL_UPDATE intltool-update)
    + mark_as_advanced(INTLTOOL_UPDATE)
    +
    + find_program(XGETTEXT xgettext)
    + mark_as_advanced(XGETTEXT)
    +
    + find_program(MSGMERGE msgmerge)
    + mark_as_advanced(MSGMERGE)
    +
    + find_program(MSGFMT msgfmt)
    + mark_as_advanced(MSGFMT)
    +
    +endif(ENABLE_NLS)