diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-07 13:49:27 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-08-07 13:49:27 +0000 |
| commit | 34e78a376c224cc0c417ebe63a44d26f4383ee0e (patch) | |
| tree | ede30c8e2f9fb3e45fb5515448d573237450c049 | |
| parent | Fix for 1030239 : Custom markers only added to the list in 'Fill and Stroke -... (diff) | |
| download | inkscape-34e78a376c224cc0c417ebe63a44d26f4383ee0e.tar.gz inkscape-34e78a376c224cc0c417ebe63a44d26f4383ee0e.zip | |
update for cmake
Fixed bugs:
- https://launchpad.net/bugs/1033979
- https://launchpad.net/bugs/1033981
(bzr r11598)
| -rw-r--r-- | CMakeScripts/Modules/FindGTK2.cmake | 1 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 22 |
2 files changed, 7 insertions, 16 deletions
diff --git a/CMakeScripts/Modules/FindGTK2.cmake b/CMakeScripts/Modules/FindGTK2.cmake index 91249b787..e986fddfd 100644 --- a/CMakeScripts/Modules/FindGTK2.cmake +++ b/CMakeScripts/Modules/FindGTK2.cmake @@ -193,6 +193,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) /usr/local/lib64 /usr/local/lib /usr/lib64 + /usr/lib/x86_64-linux-gnu /usr/lib /opt/gnome/include /opt/gnome/lib diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index d46efc374..b3bcb3fdd 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -80,9 +80,8 @@ set(ui_SRC widget/dock.cpp widget/entity-entry.cpp widget/entry.cpp - widget/frame.cpp widget/filter-effect-chooser.cpp - widget/handlebox.cpp + widget/frame.cpp widget/imageicon.cpp widget/imagetoggler.cpp widget/labelled.cpp @@ -99,7 +98,6 @@ set(ui_SRC widget/registry.cpp widget/rendering-options.cpp widget/rotateable.cpp - widget/ruler.cpp widget/scalar-unit.cpp widget/scalar.cpp widget/selected-style.cpp @@ -107,12 +105,9 @@ set(ui_SRC widget/spinbutton.cpp widget/style-subject.cpp widget/style-swatch.cpp - widget/svg-canvas.cpp widget/text.cpp widget/tolerance-slider.cpp - widget/toolbox.cpp widget/unit-menu.cpp - widget/zoom-status.cpp view/view.cpp view/view-widget.cpp @@ -198,10 +193,6 @@ set(ui_SRC tool/shape-record.h tool/transform-handle-set.h - view/edit-widget-interface.h - view/view-widget.h - view/view.h - widget/attr-widget.h widget/button.h widget/color-picker.h @@ -211,9 +202,8 @@ set(ui_SRC widget/dock.h widget/entity-entry.h widget/entry.h - widget/frame.h widget/filter-effect-chooser.h - widget/handlebox.h + widget/frame.h widget/imageicon.h widget/imagetoggler.h widget/labelled.h @@ -231,7 +221,6 @@ set(ui_SRC widget/registry.h widget/rendering-options.h widget/rotateable.h - widget/ruler.h widget/scalar-unit.h widget/scalar.h widget/selected-style.h @@ -239,12 +228,13 @@ set(ui_SRC widget/spinbutton.h widget/style-subject.h widget/style-swatch.h - widget/svg-canvas.h widget/text.h widget/tolerance-slider.h - widget/toolbox.h widget/unit-menu.h - widget/zoom-status.h + + view/edit-widget-interface.h + view/view-widget.h + view/view.h ) if(WIN32) |