← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to cmake/modules/FindGObject.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/modules/FindGObject.cmake
19
19
IF (NOT WIN32)
20
20
   # use pkg-config to get the directories and then use these values
21
21
   # in the FIND_PATH() and FIND_LIBRARY() calls
22
 
   find_package(PkgConfig)
23
 
   pkg_check_modules(GOBJECT gobject-2.0) 
 
22
   FIND_PACKAGE(PkgConfig)
 
23
   PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0) 
24
24
   #MESSAGE(STATUS "DEBUG: GObject include directory = ${GOBJECT_INCLUDE_DIRS}")
25
25
   #MESSAGE(STATUS "DEBUG: GObject link directory = ${GOBJECT_LIBRARY_DIRS}")
26
26
   #MESSAGE(STATUS "DEBUG: GObject CFlags = ${GOBJECT_CFLAGS}")
27
 
   SET(GOBJECT_DEFINITIONS ${GOBJECT_CFLAGS})
 
27
   SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER})
28
28
ENDIF (NOT WIN32)
29
29
 
30
30
FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
31
31
   PATHS
32
 
   ${GOBJECT_INCLUDE_DIRS}
33
 
   ${GOBJECT_INCLUDE_DIRS}/glib-2.0/gobject/
34
 
   /usr/include/glib-2.0/gobject/
35
 
   #PATH_SUFFIXES gst
 
32
   ${PC_GOBJECT_INCLUDEDIR}
 
33
   ${PC_GOBJECT_INCLUDE_DIRS}
 
34
   PATH_SUFFIXES glib-2.0/gobject/
36
35
   )
37
36
 
38
37
FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
39
38
   PATHS
40
 
   ${GOBJECT_LIBRARY_DIRS}
 
39
   ${PC_GOBJECT_LIBDIR}
 
40
   ${PC_GOBJECT_LIBRARY_DIRS}
41
41
   )
42
42
FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
43
43
   PATHS
44
 
   ${GOBJECT_LIBRARY_DIRS}
 
44
   ${PC_GOBJECT_LIBDIR}
 
45
   ${PC_GOBJECT_LIBRARY_DIRS}
45
46
   )
46
47
FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
47
48
   PATHS
48
 
   ${GOBJECT_LIBRARY_DIRS}
 
49
   ${PC_GOBJECT_LIBDIR}
 
50
   ${PC_GOBJECT_LIBRARY_DIRS}
49
51
   )
50
52
FIND_LIBRARY(_GLibs NAMES glib-2.0
51
53
   PATHS
52
 
   ${GOBJECT_LIBRARY_DIRS}
 
54
   ${PC_GOBJECT_LIBDIR}
 
55
   ${PC_GOBJECT_LIBRARY_DIRS}
53
56
   )
54
57
 
55
58
SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} )
71
74
    ENDIF(GObject_FIND_REQUIRED)
72
75
ENDIF (GOBJECT_FOUND)
73
76
 
74
 
MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES)
 
77
MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR _GObjectLibs _GModuleLibs _GThreadLibs _GLibs)