Cmake build fixes, minor

(bzr r7078)

11 files changed, 232 insertions, 279 deletions

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index cd2f4a712..9aea995d2 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -121,7 +121,7 @@ basic-intersection.cpp
 geom.cpp
 geom.h
 
-utils.cpp
+#utils.cpp
 utils.h
 exception.h
 angle.h
@@ -159,9 +159,9 @@ INSTALL(TARGETS 2geom
 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 INSTALL(FILES ${files} DESTINATION include/2geom/2geom)
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
-                ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
-INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
-ADD_SUBDIRECTORY (toys)
-ADD_SUBDIRECTORY (tests)
-ADD_SUBDIRECTORY (py2geom)
+#CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
+#               ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
+#INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
+#ADD_SUBDIRECTORY (toys)
+#ADD_SUBDIRECTORY (tests)
+#ADD_SUBDIRECTORY (py2geom)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e4b41d01..a6a1e2a74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,234 +1,232 @@
 IF(WIN32)

     SET(ONLY_WIN

     registrytool.cpp

-    #deptool.cpp
+    #deptool.cpp

     winmain.cpp)

 ELSEIF(WIN32)

     SET(ONLY_WIN)

 ENDIF(WIN32)

-SET(SP_SRC
-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-fecomponenttransfer-funcnode.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-font.cpp
-sp-font-face.cpp
-sp-gaussian-blur.cpp
-sp-glyph.cpp
-sp-gradient.cpp
-sp-gradient-reference.cpp
-sp-guide.cpp
-sp-glyph-kerning.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-lpe-item.cpp
-sp-mask.cpp
-sp-metadata.cpp
-sp-metrics.cpp
-sp-missing-glyph.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
-)
+SET(SP_SRC

+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-fecomponenttransfer-funcnode.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-font.cpp

+sp-font-face.cpp

+sp-gaussian-blur.cpp

+sp-glyph.cpp

+sp-gradient.cpp

+sp-gradient-reference.cpp

+sp-guide.cpp

+sp-glyph-kerning.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-lpe-item.cpp

+sp-mask.cpp

+sp-metadata.cpp

+sp-metrics.cpp

+sp-missing-glyph.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

+)

 

 SET(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
-common-context.cpp
-conditions.cpp
-conn-avoid-ref.cpp
-connector-context.cpp
-console-output-undo-observer.cpp
-context-fns.cpp
-#deptool.cpp
-desktop-affine.cpp
-desktop.cpp
-desktop-events.cpp
-desktop-handles.cpp
-desktop-style.cpp
-device-manager.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
-eraser-context.cpp
-event-context.cpp
-event-log.cpp
-extension
-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
-id-clash.cpp
-ige-mac-menu.c
-ink-action.cpp
-inkscape.cpp
-inkscape.rc
-inkscape-stock.cpp
-interface.cpp
-knot.cpp
-knotholder.cpp
-knot-holder-entity.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
-plugin.def
-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
-#selfname.tpl
-seltrans.cpp
-seltrans-handles.cpp
-shape-editor.cpp
-shortcuts.cpp
-snap.cpp
-snapped-line.cpp
-snapped-point.cpp
-snapper.cpp
-star-context.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
+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

+common-context.cpp

+conditions.cpp

+conn-avoid-ref.cpp

+connector-context.cpp

+console-output-undo-observer.cpp

+context-fns.cpp

+#deptool.cpp

+desktop-affine.cpp

+desktop.cpp

+desktop-events.cpp

+desktop-handles.cpp

+desktop-style.cpp

+device-manager.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

+eraser-context.cpp

+event-context.cpp

+event-log.cpp

+extension

+extract-uri.cpp

+file.cpp

+filter-chemistry.cpp

+filter-enums.cpp

+fixes.cpp

+flood-context.cpp

+gc-anchored.cpp

+gc.cpp

+gc-finalized.cpp

+gradient-chemistry.cpp

+gradient-context.cpp

+gradient-drag.cpp

+guide-snapper.cpp

+help.cpp

+id-clash.cpp

+ige-mac-menu.c

+ink-action.cpp

+inkscape.cpp

+inkscape.rc

+inkscape-stock.cpp

+interface.cpp

+knot.cpp

+knotholder.cpp

+knot-holder-entity.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

+plugin.def

+preferences.cpp

+prefix.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

+#selfname.tpl

+seltrans.cpp

+seltrans-handles.cpp

+shape-editor.cpp

+shortcuts.cpp

+snap.cpp

+snapped-line.cpp

+snapped-point.cpp

+snapper.cpp

+star-context.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

 zoom-context.cpp

 ${ONLY_WIN}

 )

 # All folder with CMakeLists.txt files (excluding internal libraries)

 SET(srcfolders

 algorithms

-api
+api

 application

 bind

-debug
+debug

 dialogs

 display

 dom

@@ -239,11 +237,11 @@ dom/util
 extension

 #extension/dxf2svg

 extension/implementation

-extension/internal
-extension/internal/bitmap
-extension/internal/filter
+extension/internal

+extension/internal/bitmap

+extension/internal/filter

 extension/internal/pdfinput

-extension/param
+extension/param

 extension/script

 graphlayout

 helper

@@ -285,7 +283,7 @@ ENDFOREACH(dirlist)
 

 SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})

 # All directories containing lists files that describe building internal libraries

-SET(libfolders
+SET(libfolders

 2geom

 libavoid

 libcola

@@ -293,15 +291,15 @@ libcroco
 libgdl

 libnr

 libnrtype

-libvpsc
+libvpsc

 livarot

 )

 

 FOREACH(dirlistsrc ${libfolders})

   ADD_SUBDIRECTORY(${dirlistsrc})

 ENDFOREACH(dirlistsrc)

-
-message(status "${INKSCAPE_LIBS}")
+

+message(status "${INKSCAPE_LIBS}")

 ADD_LIBRARY(sp STATIC ${SP_SRC})

 TARGET_LINK_LIBRARIES(sp 

 	 2geom avoid cola croco gdl nr nrtype vpsc livarot

@@ -310,11 +308,11 @@ TARGET_LINK_LIBRARIES(sp
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})

 TARGET_LINK_LIBRARIES(inkscape

 	 2geom avoid cola croco gdl nr nrtype vpsc livarot sp

-)
-
-# make executable for INKVIEW
-#ADD_EXECUTABLE(inkview inkview.cpp)
+)

+

+# make executable for INKVIEW

+#ADD_EXECUTABLE(inkview inkview.cpp)

 #TARGET_LINK_LIBRARIES(inkview

 #	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp

 #)

-
+

diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt
index 44fe34abd..c9c00e05b 100644
--- a/src/extension/internal/CMakeLists.txt
+++ b/src/extension/internal/CMakeLists.txt
@@ -6,7 +6,6 @@ ENDIF(WIN32)
 
 SET(extension_internal_SRC
 bluredge.cpp
-cairo-pdf-out.cpp
 cairo-png-out.cpp
 cairo-ps-out.cpp
 cairo-render-context.cpp
@@ -14,20 +13,16 @@ cairo-renderer.cpp
 cairo-renderer-pdf-out.cpp
 emf-win32-inout.cpp
 emf-win32-print.cpp
-eps-out.cpp
 gdkpixbuf-input.cpp
 gimpgrad.cpp
 grid.cpp
 latex-pstricks.cpp
 latex-pstricks-out.cpp
 odf.cpp
-pdf-cairo.cpp
 pdfinput
 pdf-input-cairo.cpp
 pov-out.cpp
 javafx-out.cpp
-ps.cpp
-ps-out.cpp
 svg.cpp
 svgz.cpp
 wpg-input.cpp
diff --git a/src/extension/internal/bitmap/CMakeLists.txt b/src/extension/internal/bitmap/CMakeLists.txt
index 7ca4137de..8aec17492 100644
--- a/src/extension/internal/bitmap/CMakeLists.txt
+++ b/src/extension/internal/bitmap/CMakeLists.txt
@@ -6,7 +6,6 @@ channel.cpp
 charcoal.cpp
 colorize.cpp
 contrast.cpp
-convolve.cpp
 cycleColormap.cpp
 despeckle.cpp
 edge.cpp
diff --git a/src/extension/internal/filter/CMakeLists.txt b/src/extension/internal/filter/CMakeLists.txt
index ec76a902e..80a14ba3a 100644
--- a/src/extension/internal/filter/CMakeLists.txt
+++ b/src/extension/internal/filter/CMakeLists.txt
@@ -1,33 +1,8 @@
 SET(extension_internal_filter_SRC
-apparition.h
-bloom.h
-clouds.h
-crystal.h
-cutout.h
 drop-shadow.h
-emboss.h
-etched-glass.h
 filter-all.cpp
 filter.cpp
 filter-file.cpp
 filter.h
-fire.h
-frost.h
-ink-bleed.h
-jelly-bean.h
-jigsaw-piece.h
-leopard-fur.h
-melt.h
-metal.h
-motion-blur.h
-oil-slick.h
-patterned-glass.h
-ridged-border.h
-ripple.h
-roughen.h
-rubber-stamp.h
-sepia.h
 snow.h
-speckle.h
-zebra.h
 )
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 00307fcdd..d29b83da8 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,6 +1,5 @@
 SET(libnr_SRC
 #in-svg-plane-test.cpp
-n-art-bpath-2geom.cpp
 nr-blit.cpp
 nr-compose.cpp
 nr-compose-transform.cpp
@@ -9,9 +8,7 @@ nr-matrix.cpp
 nr-matrix-div.cpp
 nr-matrix-fns.cpp
 nr-matrix-rotate-ops.cpp
-nr-matrix-test.cpp
 nr-object.cpp
-nr-path.cpp
 nr-pixblock.cpp
 nr-pixblock-line.cpp
 nr-pixblock-pattern.cpp
@@ -23,9 +20,7 @@ nr-rect-l.cpp
 nr-rotate-fns.cpp
 #nr-rotate-fns-test.cpp
 nr-rotate-matrix-ops.cpp
-nr-rotate-test.cpp
 nr-scale-matrix-ops.cpp
-nr-scale-test.cpp
 nr-scale-translate-ops.cpp
 nr-translate-matrix-ops.cpp
 nr-translate-rotate-ops.cpp
diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt
index f93d8910a..2fa0d5bc6 100644
--- a/src/live_effects/parameter/CMakeLists.txt
+++ b/src/live_effects/parameter/CMakeLists.txt
@@ -5,7 +5,6 @@ parameter.cpp
 path.cpp
 path-reference.cpp
 point.cpp
-pointparam-knotholder.cpp
 random.cpp
 text.cpp
 unit.cpp
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 707b86736..fbf214393 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,7 +1,6 @@
 SET(svg_SRC
 css-ostringstream.cpp
 #ftos.cpp
-gnome-canvas-bpath-util.cpp
 itos.cpp
 path-string.cpp
 round.cpp
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 48884807d..6c5a9350b 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,7 +1,6 @@
 SET(ui_SRC
 clipboard.cpp
 context-menu.cpp
-icons.cpp
 previewholder.cpp
 stock.cpp
 stock-items.cpp
diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt
index 5a0d6a08e..1d912cf9f 100644
--- a/src/ui/dialog/CMakeLists.txt
+++ b/src/ui/dialog/CMakeLists.txt
@@ -15,7 +15,6 @@ dialog-manager.cpp
 dock-behavior.cpp
 document-metadata.cpp
 document-properties.cpp
-export.cpp
 extension-editor.cpp
 filedialog.cpp
 filedialogimpl-gtkmm.cpp
@@ -25,7 +24,6 @@ find.cpp
 floating-behavior.cpp
 inkscape-preferences.cpp
 input.cpp
-layer-editor.cpp
 livepatheffect-editor.cpp
 memory.cpp
 messages.cpp
@@ -33,15 +31,12 @@ ocaldialogs.cpp
 print.cpp
 scriptdialog.cpp
 #session-player.cpp
-text-properties.cpp
 tile.cpp
 tracedialog.cpp
 transformation.cpp
-tree-editor.cpp
 undo-history.cpp
 #whiteboard-connect.cpp
 #whiteboard-sharewithchat.cpp
 #whiteboard-sharewithuser.cpp
-xml-editor.cpp
 ${ui_dialog_WIN32_SRC}
 )
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index b11720c26..82b5a0fb0 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,5 +1,4 @@
 SET(util_SRC
-list-container-test.cpp
 share.cpp
 units.cpp
 )