nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Depend on glib-2.16

Browse Source
This commit is contained in:
Yevgen Muntyan 2010-02-22 23:07:31 -08:00
parent d31e2de9d8
commit 26c85e1f77
3 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/gtk.cmake
View File

@ -7,14 +7,8 @@ MACRO(_MOO_GET_PKG_CONFIG_VARIABLE cmakevar pkgconfigvar pkgname)
STRING(STRIP ${${cmakevar}} ${cmakevar})
ENDMACRO(_MOO_GET_PKG_CONFIG_VARIABLE)
PKG_CHECK_MODULES(GLIB REQUIRED glib-2.0>=2.14)
PKG_CHECK_MODULES(GTK REQUIRED gtk+-2.0 glib-2.0 gmodule-2.0 gthread-2.0 gobject-2.0)
PKG_CHECK_MODULES(GIO gio-2.0)
PKG_CHECK_MODULES(GTK REQUIRED gtk+-2.0 glib-2.0 gio-2.0 gmodule-2.0 gthread-2.0 gobject-2.0)
LIST(APPEND MOO_DEP_LIBS ${GTK_LIBRARIES})
IF(GIO_FOUND)
LIST(APPEND MOO_DEP_LIBS ${GIO_LIBRARIES})
ENDIF(GIO_FOUND)
MOO_ADD_COMPILE_DEFINITIONS(RELEASE -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT)
MOO_ADD_COMPILER_FLAGS(GCC WIN32 -mms-bitfields)

29
config.cmake
View File

@ -53,35 +53,6 @@ MACRO(MOO_CHECK_STRUCT_HAS_MEMBER struct field incfile varname)
ENDMACRO(MOO_CHECK_STRUCT_HAS_MEMBER)
IF(NOT GIO_FOUND)
INCLUDE_DIRECTORIES(${MOO_SOURCE_DIR}/moo/mooutils/newgtk/glib-2.16)
MOO_CHECK_HEADERS(dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h)
MOO_CHECK_HEADERS(sys/time.h sys/times.h sys/wait.h unistd.h values.h)
MOO_CHECK_HEADERS(sys/select.h sys/types.h stdint.h sched.h malloc.h)
MOO_CHECK_HEADERS(sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h)
MOO_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtimensec "sys/stat.h" HAVE_STAT_ST_MTIMENSEC)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtim.tv_nsec "sys/stat.h" HAVE_STAT_ST_MTIM_TV_NSEC)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_atimensec "sys/stat.h" HAVE_STAT_ST_ATIMENSEC)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_ctimensec "sys/stat.h" HAVE_STAT_ST_CTIMENSEC)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_ctim.tv_nsec "sys/stat.h" HAVE_STAT_ST_CTIM_TV_NSEC)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_blksize "sys/stat.h" HAVE_STAT_ST_BLKSIZE)
CHECK_STRUCT_HAS_MEMBER("struct stat" st_blocks "sys/stat.h" HAVE_STAT_ST_BLOCKS)
CHECK_STRUCT_HAS_MEMBER("struct statfs" f_fstypename "sys/statfs.h" HAVE_STATFS_F_FSTYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statfs" f_bavail "sys/statfs.h" HAVE_STATFS_F_BAVAIL)
# struct statvfs.f_basetype is available on Solaris but not for Linux.
CHECK_STRUCT_HAS_MEMBER("struct statvfs" f_basetype sys/statvfs.h HAVE_STATFS_F_BASETYPE)
# Check for some functions
MOO_CHECK_FUNCTIONS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk)
MOO_CHECK_FUNCTIONS(chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid)
MOO_CHECK_FUNCTIONS(getmntent_r setmntent endmntent hasmntopt getmntinfo)
ENDIF(NOT GIO_FOUND)
# for xdgmime
MOO_CHECK_FUNCTIONS(getc_unlocked)
# for GMappedFile and xdgmime

4
moo/mooutils/CMakeLists.txt
View File

@ -208,10 +208,6 @@ MOO_GEN_PIXMAP_FILE(moofileicon-symlink.h
SYMLINK_ARROW_SMALL symlink-small.png
)
IF(GLIB_VERSION VERSION_LESS "2.16.0")
ADD_SUBDIRECTORY(newgtk)
ENDIF(GLIB_VERSION VERSION_LESS "2.16.0")
MOO_ADD_MOO_CODE_MODULE(mooutils)
ADD_SUBDIRECTORY(xdgmime)