diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-04-13 09:46:28 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-04-13 09:46:28 +0000 |
| commit | 0336a2a6926411517cdba3baa93a0bd67411cfe1 (patch) | |
| tree | 3895ac6d5aab33041e863cfcd45566ba50ec293d /src | |
| parent | Disable inkscape.desktop translation for old gettext (diff) | |
| download | inkscape-0336a2a6926411517cdba3baa93a0bd67411cfe1.tar.gz inkscape-0336a2a6926411517cdba3baa93a0bd67411cfe1.zip | |
Fix cmake build
(bzr r14818)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/interface.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/widgets/Makefile_insert | 4 | ||||
| -rw-r--r-- | src/widgets/image-menu-item.c (renamed from src/widgets/imagemenuitem.c) | 2 | ||||
| -rw-r--r-- | src/widgets/image-menu-item.h (renamed from src/widgets/imagemenuitem.h) | 0 | ||||
| -rw-r--r-- | src/widgets/ink-action.cpp | 2 |
6 files changed, 13 insertions, 5 deletions
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 6d0a85f13..a16bbc472 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -80,7 +80,7 @@ #include "ui/dialog/layer-properties.h" #if GTK_CHECK_VERSION(3,0,0) - #include "widgets/imagemenuitem.h" + #include "widgets/image-menu-item.h" #endif #include <gdk/gdkkeysyms.h> diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index c38bde5cf..8cb6e947f 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -110,6 +110,11 @@ set(widgets_SRC widget-sizes.h ) +if(${WITH_GTK3_EXPERIMENTAL}) + set(image_menu_item_SRC image-menu-item.h image-menu-item.c) + add_inkscape_source("${image_menu_item_SRC}") +endif() + # add_inkscape_lib(widgets_LIB "${widgets_SRC}") add_inkscape_source("${widgets_SRC}") @@ -121,3 +126,6 @@ set ( widgets_paintbucket_SRC if ("${HAVE_POTRACE}") add_inkscape_source("${widgets_paintbucket_SRC}") endif() + + + diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 10462a859..2ee0f7002 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -2,8 +2,8 @@ if WITH_GTKMM_3_0 ink_common_sources += \ - widgets/imagemenuitem.c \ - widgets/imagemenuitem.h + widgets/image-menu-item.c \ + widgets/image-menu-item.h endif ink_common_sources += \ diff --git a/src/widgets/imagemenuitem.c b/src/widgets/image-menu-item.c index 86c44fe32..2b9500ba0 100644 --- a/src/widgets/imagemenuitem.c +++ b/src/widgets/image-menu-item.c @@ -25,7 +25,7 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include "widgets/imagemenuitem.h" +#include "widgets/image-menu-item.h" /** * SECTION:gtkimagemenuitem diff --git a/src/widgets/imagemenuitem.h b/src/widgets/image-menu-item.h index 61cc48f3a..61cc48f3a 100644 --- a/src/widgets/imagemenuitem.h +++ b/src/widgets/image-menu-item.h diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index 44ba5c7f9..ace99d9aa 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -11,7 +11,7 @@ #if GTK_CHECK_VERSION(3,0,0) // Fork of gtk-imagemenuitem to continue support - #include "widgets/imagemenuitem.h" + #include "widgets/image-menu-item.h" #endif |