diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-26 16:39:31 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-08-26 16:39:31 +0200 |
| commit | b777e2f5722c3c4042e527787d6ed3c4d4195b64 (patch) | |
| tree | fe6a9e181afeed94be4413a59bddf2d82d07951c /CMakeLists.txt | |
| parent | 897e4c6bee4c75845caa7c2e88850def6d5674f3 (diff) | |
| parent | 4b19e75939c5b7122d1429f6f258d4b83cd90dde (diff) | |
New upstream release after gdb error
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f69ad3..b2696ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ find_package(PkgConfig) pkg_check_modules(GTK3 REQUIRED gtk+-3.0) pkg_check_modules(INDICATOR3 appindicator3-0.1) pkg_check_modules(WNCK REQUIRED libwnck-3.0) -pkg_check_modules(BAMF REQUIRED libbamf3) pkg_check_modules(GIO REQUIRED gio-unix-2.0) pkg_check_modules(CAIRO REQUIRED cairo) pkg_check_modules(GEE REQUIRED gee-0.8) @@ -36,6 +35,7 @@ pkg_check_modules(X11 REQUIRED x11) pkg_check_modules(XML REQUIRED libxml-2.0) pkg_check_modules(XTST REQUIRED xtst) pkg_check_modules(GMENU3 libgnome-menu-3.0) +pkg_check_modules(BAMF libbamf3) find_library(M_LIB m) find_library(GTHREAD_LIB gthread-2.0) @@ -47,13 +47,18 @@ set(CFLAGS ${CAIRO_CFLAGS} ${CAIRO_CFLAGS_OTHER} ${GEE_CFLAGS} ${CAIRO_CFLAGS_OTHER} ${X11_CFLAGS} ${X11_CFLAGS_OTHER} - -DGMENU_I_KNOW_THIS_IS_UNSTABLE - -DWNCK_I_KNOW_THIS_IS_UNSTABLE + -DGMENU_I_KNOW_THIS_IS_UNSTABLE + -DWNCK_I_KNOW_THIS_IS_UNSTABLE -DGETTEXT_PACKAGE="gnomepie" - -s -O3 -w -# -g + -s -O3 -w +# -g ) +# use bamf if available for better icon handling +if (${BAMF_FOUND}) + LIST(APPEND CFLAGS -DHAVE_BAMF) +endif (${BAMF_FOUND}) + # fallback to gnome-menus2 if gnome-menus3 wasn't found if (${GMENU3_FOUND}) LIST(APPEND CFLAGS -DHAVE_GMENU_3) @@ -135,7 +140,6 @@ set(VALA_PKGS gtk+-3.0 gdk-x11-3.0 libwnck-3.0 - libbamf3 cairo gee-0.8 x11 @@ -146,6 +150,10 @@ set(VALA_PKGS libarchive ) +if (${BAMF_FOUND}) + LIST(APPEND VALA_PKGS libbamf3) +endif (${BAMF_FOUND}) + if (${INDICATOR_FOUND}) LIST(APPEND VALA_PKGS appindicator-0.1) endif (${INDICATOR_FOUND}) |