Cmake: Fixed issues with pedro not linking correctly

(bzr r5534)

3 files changed, 550 insertions, 210 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 56526705c..2d9106337 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,8 @@ SET(srcfolders
 algorithms

 api

 bind

-debug

+debug
+dialogs

 display

 dom

 dom/io

@@ -39,7 +40,7 @@ jabber_whiteboard
 jabber_whiteboard/dialog

 live_effects

 live_effects/parameter

-#pedro

+pedro

 removeoverlap

 svg

 trace

@@ -74,7 +75,7 @@ ENDFOREACH(dirlist)
 SET(libfolders
 2geom

 application

-dialogs

+#dialogs

 libavoid

 libcola

 libcroco

@@ -91,8 +92,10 @@ ENDFOREACH(dirlist)
 

 IF(WIN32)

 SET(ONLY_WIN

-registrytool.cpp

-#deptool.cpp

+registrytool.cpp
+registrytool.h

+#deptool.cpp
+winmain.cpp

 )

 ELSEIF(WIN32)

 SET(ONLY_WIN)

@@ -100,207 +103,509 @@ ENDIF(WIN32)
 

 SET(INKSCAPE_SRC

 ${INKSCAPE_SRC}

-arc-context.cpp

-attributes.cpp

-axis-manip.cpp

-box3d-context.cpp

-box3d.cpp

-box3d-side.cpp

-color.cpp

-color-profile.cpp

-composite-undo-stack-observer.cpp

-conditions.cpp

-conn-avoid-ref.cpp

-connector-context.cpp

-console-output-undo-observer.cpp

-context-fns.cpp

-desktop-affine.cpp

-desktop.cpp

-desktop-events.cpp

-desktop-handles.cpp

-desktop-style.cpp

-dir-util.cpp

-document.cpp

-document-subset.cpp

-document-undo.cpp

-doxygen-main.cpp

-draw-anchor.cpp

-draw-context.cpp

-dropper-context.cpp

-dyna-draw-context.cpp

-ege-adjustment-action.cpp

-ege-color-prof-tracker.cpp

-ege-output-action.cpp

-ege-select-one-action.cpp

-event-context.cpp

-event-log.cpp

-extract-uri.cpp

-file.cpp

-filter-chemistry.cpp

-filter-enums.cpp

-fixes.cpp

-flood-context.cpp

-fontsize-expansion.cpp

-gc-anchored.cpp

-gc.cpp

-gc-finalized.cpp

-gradient-chemistry.cpp

-gradient-context.cpp

-gradient-drag.cpp

-guide-snapper.cpp

-help.cpp

-ink-action.cpp

-inkscape.cpp

-inkscape-stock.cpp

-##inkview is another executable file

-##needs to be separated as a second target

-#inkview.cpp

-interface.cpp

-knot.cpp

-knotholder.cpp

-layer-fns.cpp

-layer-manager.cpp

-line-geometry.cpp

-line-snapper.cpp

-main-cmdlineact.cpp

-main.cpp

-marker.cpp

-media.cpp

-message-context.cpp

-message-stack.cpp

-mod360.cpp

-node-context.cpp

-nodepath.cpp

-object-edit.cpp

-object-hierarchy.cpp

-object-snapper.cpp

-path-chemistry.cpp

-pencil-context.cpp

-pen-context.cpp

-persp3d.cpp

-persp3d-reference.cpp

-perspective-line.cpp

-preferences.cpp

-prefix.cpp

-prefs-utils.cpp

-print.cpp

-profile-manager.cpp

-proj_pt.cpp

-rect-context.cpp

-rubberband.cpp

-satisfied-guide-cns.cpp

-selcue.cpp

-select-context.cpp

-selection-chemistry.cpp

-selection.cpp

-selection-describer.cpp

-seltrans.cpp

-seltrans-handles.cpp

-shape-editor.cpp

-shortcuts.cpp

-snap.cpp

-snapped-line.cpp

-snapped-point.cpp

-snapper.cpp

-sp-anchor.cpp

-sp-animation.cpp

-sp-clippath.cpp

-sp-conn-end.cpp

-sp-conn-end-pair.cpp

-sp-cursor.cpp

-sp-defs.cpp

-sp-ellipse.cpp

-sp-feblend.cpp

-sp-fecolormatrix.cpp

-sp-fecomponenttransfer.cpp

-sp-fecomposite.cpp

-sp-feconvolvematrix.cpp

-sp-fediffuselighting.cpp

-sp-fedisplacementmap.cpp

-sp-fedistantlight.cpp

-sp-feflood.cpp

-sp-feimage.cpp

-sp-femerge.cpp

-sp-femergenode.cpp

-sp-femorphology.cpp

-sp-feoffset.cpp

-sp-fepointlight.cpp

-sp-fespecularlighting.cpp

-sp-fespotlight.cpp

-sp-fetile.cpp

-sp-feturbulence.cpp

-sp-filter.cpp

-sp-filter-primitive.cpp

-sp-filter-reference.cpp

-sp-flowdiv.cpp

-sp-flowregion.cpp

-sp-flowtext.cpp

-sp-gaussian-blur.cpp

-sp-gradient.cpp

-sp-gradient-reference.cpp

-sp-guide.cpp

-sp-image.cpp

-spiral-context.cpp

-sp-item.cpp

-sp-item-group.cpp

-sp-item-notify-moveto.cpp

-sp-item-rm-unsatisfied-cns.cpp

-sp-item-transform.cpp

-sp-item-update-cns.cpp

-sp-line.cpp

-splivarot.cpp

-sp-mask.cpp

-sp-metadata.cpp

-sp-metrics.cpp

-sp-namedview.cpp

-sp-object.cpp

-sp-object-group.cpp

-sp-object-repr.cpp

-sp-offset.cpp

-sp-paint-server.cpp

-sp-path.cpp

-sp-pattern.cpp

-sp-polygon.cpp

-sp-polyline.cpp

-sp-rect.cpp

-sp-root.cpp

-sp-shape.cpp

-sp-skeleton.cpp

-sp-spiral.cpp

-sp-star.cpp

-sp-string.cpp

-sp-style-elem.cpp

-sp-switch.cpp

-sp-symbol.cpp

-sp-text.cpp

-sp-tref.cpp

-sp-tref-reference.cpp

-sp-tspan.cpp

-sp-use.cpp

-sp-use-reference.cpp

-star-context.cpp

-streams-gzip.cpp

-streams-handles.cpp

-streams-jar.cpp

-streams-zlib.cpp

-style.cpp

-#style-test.cpp

-svg-view.cpp

-svg-view-widget.cpp

-text-chemistry.cpp

-text-context.cpp

-text-editing.cpp

-tools-switch.cpp

-transf_mat_3x4.cpp

-tweak-context.cpp

-uri.cpp

-uri-references.cpp

-vanishing-point.cpp

-verbs.cpp

-version.cpp

-winmain.cpp

-zoom-context.cpp

-${ONLY_WIN}

+approx-equal.h
+arc-context.cpp
+arc-context.h
+attributes.cpp
+attributes.h
+attributes-test.h
+axis-manip.cpp
+axis-manip.h
+bad-uri-exception.h
+box3d-context.cpp
+box3d-context.h
+box3d.cpp
+box3d.h
+box3d-side.cpp
+box3d-side.h
+brokenimage.xpm
+color.cpp
+color.h
+color-profile.cpp
+color-profile-fns.h
+color-profile.h
+color-profile-test.h
+color-rgba.h
+composite-undo-stack-observer.cpp
+composite-undo-stack-observer.h
+conditions.cpp
+conditions.h
+conn-avoid-ref.cpp
+conn-avoid-ref.h
+connection-pool.h
+connector-context.cpp
+connector-context.h
+console-output-undo-observer.cpp
+console-output-undo-observer.h
+context-fns.cpp
+context-fns.h
+decimal-round.h
+deptool.cpp
+desktop-affine.cpp
+desktop-affine.h
+desktop.cpp
+desktop-events.cpp
+desktop-events.h
+desktop.h
+desktop-handles.cpp
+desktop-handles.h
+desktop-style.cpp
+desktop-style.h
+device-manager.cpp
+device-manager.h
+dir-util.cpp
+dir-util.h
+dir-util-test.h
+document.cpp
+document.h
+document-private.h
+document-subset.cpp
+document-subset.h
+document-undo.cpp
+doxygen-main.cpp
+draw-anchor.cpp
+draw-anchor.h
+draw-context.cpp
+draw-context.h
+dropper-context.cpp
+dropper-context.h
+dyna-draw-context.cpp
+dyna-draw-context.h
+ege-adjustment-action.cpp
+ege-adjustment-action.h
+ege-color-prof-tracker.cpp
+ege-color-prof-tracker.h
+ege-output-action.cpp
+ege-output-action.h
+ege-select-one-action.cpp
+ege-select-one-action.h
+enums.h
+eraser-context.cpp
+eraser-context.h
+event-context.cpp
+event-context.h
+event.h
+event-log.cpp
+event-log.h
+extension
+extract-uri.cpp
+extract-uri.h
+extract-uri-test.h
+file.cpp
+file.h
+fill-or-stroke.h
+filter-chemistry.cpp
+filter-chemistry.h
+filter-enums.cpp
+filter-enums.h
+fixes.cpp
+flood-context.cpp
+flood-context.h
+fontsize-expansion.cpp
+fontsize-expansion.h
+forward.h
+gc-alloc.h
+gc-anchored.cpp
+gc-anchored.h
+gc-core.h
+gc.cpp
+gc-finalized.cpp
+gc-finalized.h
+gc-managed.h
+gc-soft-ptr.h
+gradient-chemistry.cpp
+gradient-chemistry.h
+gradient-context.cpp
+gradient-context.h
+gradient-drag.cpp
+gradient-drag.h
+guide-snapper.cpp
+guide-snapper.h
+help.cpp
+helper-fns.h
+help.h
+icon-size.h
+ige-mac-menu.c
+ige-mac-menu.h
+ink-action.cpp
+ink-action.h
+inkscape.cpp
+inkscape.h
+inkscape-private.h
+inkscape.rc
+inkscape-stock.cpp
+inkscape-stock.h
+inkscape_version.h.mingw
+inkview.cpp
+inkview-manifest.xml
+inkview.rc
+interface.cpp
+interface.h
+isinf.h
+isnan.h
+isnormal.h
+jabber_whiteboard
+knot.cpp
+knot-enums.h
+knot.h
+knotholder.cpp
+knot-holder-entity.h
+knotholder.h
+layer-fns.cpp
+layer-fns.h
+layer-manager.cpp
+layer-manager.h
+line-geometry.cpp
+line-geometry.h
+line-snapper.cpp
+line-snapper.h
+macros.h
+main-cmdlineact.cpp
+main-cmdlineact.h
+main.cpp
+marker.cpp
+marker.h
+media.cpp
+media.h
+memeq.h
+menus-skeleton.h
+message-context.cpp
+message-context.h
+message.h
+message-stack.cpp
+message-stack.h
+mod360.cpp
+mod360.h
+mod360-test.h
+modifier-fns.h
+MultiPrinter.h
+node-context.cpp
+node-context.h
+nodepath.cpp
+nodepath.h
+number-opt-number.h
+object-edit.cpp
+object-edit.h
+object-hierarchy.cpp
+object-hierarchy.h
+object-snapper.cpp
+object-snapper.h
+path-chemistry.cpp
+path-chemistry.h
+path-prefix.h
+pencil-context.cpp
+pencil-context.h
+pen-context.cpp
+pen-context.h
+persp3d.cpp
+persp3d.h
+persp3d-reference.cpp
+persp3d-reference.h
+perspective-line.cpp
+perspective-line.h
+plugin.def
+preferences.cpp
+preferences.h
+preferences-skeleton.h
+prefix.cpp
+prefix.h
+prefs-utils.cpp
+prefs-utils.h
+print.cpp
+print.h
+profile-manager.cpp
+profile-manager.h
+proj_pt.cpp
+proj_pt.h
+PylogFormatter.h
+rect-context.cpp
+rect-context.h
+remove-last.h
+require-config.h
+round.h
+round-test.h
+rubberband.cpp
+rubberband.h
+satisfied-guide-cns.cpp
+satisfied-guide-cns.h
+selcue.cpp
+selcue.h
+select-context.cpp
+select-context.h
+selection-chemistry.cpp
+selection-chemistry.h
+selection.cpp
+selection-describer.cpp
+selection-describer.h
+selection.h
+selfname.tpl
+seltrans.cpp
+seltrans.h
+seltrans-handles.cpp
+seltrans-handles.h
+shape-editor.cpp
+shape-editor.h
+shortcuts.cpp
+shortcuts.h
+snap.cpp
+snap.h
+snapped-line.cpp
+snapped-line.h
+snapped-point.cpp
+snapped-point.h
+snapper.cpp
+snapper.h
+sp-anchor.cpp
+sp-anchor.h
+sp-animation.cpp
+sp-animation.h
+sp-clippath.cpp
+sp-clippath.h
+sp-conn-end.cpp
+sp-conn-end.h
+sp-conn-end-pair.cpp
+sp-conn-end-pair.h
+sp-cursor.cpp
+sp-cursor.h
+sp-defs.cpp
+sp-defs.h
+sp-ellipse.cpp
+sp-ellipse.h
+sp-feblend.cpp
+sp-feblend-fns.h
+sp-feblend.h
+sp-fecolormatrix.cpp
+sp-fecolormatrix-fns.h
+sp-fecolormatrix.h
+sp-fecomponenttransfer.cpp
+sp-fecomponenttransfer-fns.h
+sp-fecomponenttransfer-funcnode.cpp
+sp-fecomponenttransfer-funcnode.h
+sp-fecomponenttransfer.h
+sp-fecomposite.cpp
+sp-fecomposite-fns.h
+sp-fecomposite.h
+sp-feconvolvematrix.cpp
+sp-feconvolvematrix-fns.h
+sp-feconvolvematrix.h
+sp-fediffuselighting.cpp
+sp-fediffuselighting-fns.h
+sp-fediffuselighting.h
+sp-fedisplacementmap.cpp
+sp-fedisplacementmap-fns.h
+sp-fedisplacementmap.h
+sp-fedistantlight.cpp
+sp-fedistantlight.h
+sp-feflood.cpp
+sp-feflood-fns.h
+sp-feflood.h
+sp-feimage.cpp
+sp-feimage-fns.h
+sp-feimage.h
+sp-femerge.cpp
+sp-femerge-fns.h
+sp-femerge.h
+sp-femergenode.cpp
+sp-femergenode.h
+sp-femorphology.cpp
+sp-femorphology-fns.h
+sp-femorphology.h
+sp-feoffset.cpp
+sp-feoffset-fns.h
+sp-feoffset.h
+sp-fepointlight.cpp
+sp-fepointlight.h
+sp-fespecularlighting.cpp
+sp-fespecularlighting-fns.h
+sp-fespecularlighting.h
+sp-fespotlight.cpp
+sp-fespotlight.h
+sp-fetile.cpp
+sp-fetile-fns.h
+sp-fetile.h
+sp-feturbulence.cpp
+sp-feturbulence-fns.h
+sp-feturbulence.h
+sp-filter.cpp
+sp-filter-fns.h
+sp-filter.h
+sp-filter-primitive.cpp
+sp-filter-primitive.h
+sp-filter-reference.cpp
+sp-filter-reference.h
+sp-filter-units.h
+sp-flowdiv.cpp
+sp-flowdiv.h
+sp-flowregion.cpp
+sp-flowregion.h
+sp-flowtext.cpp
+sp-flowtext.h
+sp-font.cpp
+sp-font.h
+sp-gaussian-blur.cpp
+sp-gaussian-blur-fns.h
+sp-gaussian-blur.h
+sp-glyph.cpp
+sp-glyph.h
+sp-gradient.cpp
+sp-gradient-fns.h
+sp-gradient.h
+sp-gradient-reference.cpp
+sp-gradient-reference.h
+sp-gradient-spread.h
+sp-gradient-test.h
+sp-gradient-units.h
+sp-gradient-vector.h
+sp-guide-attachment.h
+sp-guide-constraint.h
+sp-guide.cpp
+sp-guide.h
+sp-image.cpp
+sp-image.h
+spiral-context.cpp
+spiral-context.h
+sp-item.cpp
+sp-item-group.cpp
+sp-item-group.h
+sp-item.h
+sp-item-notify-moveto.cpp
+sp-item-notify-moveto.h
+sp-item-rm-unsatisfied-cns.cpp
+sp-item-rm-unsatisfied-cns.h
+sp-item-transform.cpp
+sp-item-transform.h
+sp-item-update-cns.cpp
+sp-item-update-cns.h
+sp-linear-gradient-fns.h
+sp-linear-gradient.h
+sp-line.cpp
+sp-line.h
+splivarot.cpp
+splivarot.h
+sp-lpe-item.cpp
+sp-lpe-item.h
+sp-marker-loc.h
+sp-mask.cpp
+sp-mask.h
+sp-metadata.cpp
+sp-metadata.h
+sp-metric.h
+sp-metrics.cpp
+sp-metrics.h
+sp-missing-glyph.cpp
+sp-missing-glyph.h
+sp-namedview.cpp
+sp-namedview.h
+sp-object.cpp
+sp-object-group.cpp
+sp-object-group.h
+sp-object.h
+sp-object-repr.cpp
+sp-object-repr.h
+sp-offset.cpp
+sp-offset.h
+sp-paint-server.cpp
+sp-paint-server.h
+sp-path.cpp
+sp-path.h
+sp-pattern.cpp
+sp-pattern.h
+sp-polygon.cpp
+sp-polygon.h
+sp-polyline.cpp
+sp-polyline.h
+sp-radial-gradient-fns.h
+sp-radial-gradient.h
+sp-rect.cpp
+sp-rect.h
+sp-root.cpp
+sp-root.h
+sp-shape.cpp
+sp-shape.h
+sp-skeleton.cpp
+sp-skeleton.h
+sp-spiral.cpp
+sp-spiral.h
+sp-star.cpp
+sp-star.h
+sp-stop-fns.h
+sp-stop.h
+sp-string.cpp
+sp-string.h
+sp-style-elem.cpp
+sp-style-elem.h
+sp-style-elem-test.h
+sp-switch.cpp
+sp-switch.h
+sp-symbol.cpp
+sp-symbol.h
+sp-text.cpp
+sp-text.h
+sp-textpath.h
+sp-tref.cpp
+sp-tref.h
+sp-tref-reference.cpp
+sp-tref-reference.h
+sp-tspan.cpp
+sp-tspan.h
+sp-use.cpp
+sp-use.h
+sp-use-reference.cpp
+sp-use-reference.h
+star-context.cpp
+star-context.h
+streams-gzip.cpp
+streams-gzip.h
+streams-handles.cpp
+streams-handles.h
+streams-jar.cpp
+streams-jar.h
+streams-zlib.cpp
+streams-zlib.h
+streq.h
+strneq.h
+style.cpp
+style.h
+style-test.cpp
+style-test.h
+svg-profile.h
+svg-view.cpp
+svg-view.h
+svg-view-widget.cpp
+svg-view-widget.h
+syseq.h
+test-helpers.h
+text-chemistry.cpp
+text-chemistry.h
+text-context.cpp
+text-context.h
+text-editing.cpp
+text-editing.h
+text-tag-attributes.h
+tools-switch.cpp
+tools-switch.h
+transf_mat_3x4.cpp
+transf_mat_3x4.h
+TRPIFormatter.h
+tweak-context.cpp
+tweak-context.h
+undo-stack-observer.h
+unit-constants.h
+uri.cpp
+uri.h
+uri-references.cpp
+uri-references.h
+vanishing-point.cpp
+vanishing-point.h
+verbs.cpp
+verbs.h
+verbs-test.h
+version.cpp
+version.h
+zoom-context.cpp
+zoom-context.h

+${ONLY_WIN}
+

 )

 

 # make executable for INKSCAPE

diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index 892abe342..d8737f7a4 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -1,29 +1,52 @@
 SET(dialogs
 clonetiler.cpp
+clonetiler.h
 debugdialog.cpp
+debugdialog.h
 dialog-events.cpp
+dialog-events.h
 eek-color-def.cpp
+eek-color-def.h
 eek-preview.cpp
+eek-preview.h
 export.cpp
+export.h
 extensions.cpp
+extensions.h
 fill-style.cpp
+fill-style.h
 find.cpp
+find.h
 guidelinedialog.cpp
+guidelinedialog.h
 iconpreview.cpp
+iconpreview.h
 in-dt-coordsys.cpp
+in-dt-coordsys.h
 input.cpp
+input.h
 item-properties.cpp
+item-properties.h
 layer-properties.cpp
+layer-properties.h
 layers-panel.cpp
+layers-panel.h
 object-attributes.cpp
+object-attributes.h
 rdf.cpp
+rdf.h
 sp-attribute-widget.cpp
+sp-attribute-widget.h
 stroke-style.cpp
+stroke-style.h
 swatches.cpp
+swatches.h
 text-edit.cpp
+text-edit.h
 tiledialog.cpp
+tiledialog.h
 unclump.cpp
+unclump.h
 xml-tree.cpp
+xml-tree.h
 )
-
-ADD_LIBRARY(inkdialogs STATIC ${dialogs})
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index a8d4c1579..1906f8a9b 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -1,6 +1,13 @@
 SET(live_effects_SRC
+bezctx.cpp
+bezctx.h
+bezctx_intf.h
 effect.cpp
 effect.h
+lpe-bendpath.cpp
+lpe-bendpath.h
+lpe-circle_with_radius.cpp
+lpe-circle_with_radius.h
 lpe-curvestitch.cpp
 lpe-curvestitch.h
 lpe-gears.cpp
@@ -13,19 +20,24 @@ lpeobject.cpp
 lpeobject.h
 lpeobject-reference.cpp
 lpeobject-reference.h
-lpe-bendpath.cpp
-lpe-bendpath.h
 lpe-patternalongpath.cpp
 lpe-patternalongpath.h
+lpe-perspective_path.cpp
+lpe-perspective_path.h
 lpe-skeleton.cpp
 lpe-skeleton.h
 lpe-sketch.cpp
 lpe-sketch.h
 lpe-slant.cpp
 lpe-slant.h
+lpe-spiro.cpp
+lpe-spiro.h
 lpe-test-doEffect-stack.cpp
 lpe-test-doEffect-stack.h
 lpe-vonkoch.cpp
 lpe-vonkoch.h
+spiro.cpp
+spiro.h
+todo.txt
 )