Cmake: Moved sp-* into own library to reduce link cmdline and add new files to their...

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 7b74aef71bfc4929f219b105d98af636ce7921a1..94d43263b699de744d6c417695f8b0885e46fc60 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -5,6 +5,7 @@ SET(INKSCAPE_DEPENDS
 #    cairomm-1.0\r
 #    glib-2.0
 #    glibmm-2.4
+    gsl
     gtk+-2.0
     gtkmm-2.4
     sigc++-2.0\r
@@ -14,7 +15,6 @@ SET(INKSCAPE_DEPENDS
     libxml-2.0\r
     libxslt\r
     ImageMagick++\r
-    libpopt\r
     freetype2)\r
 SET(INKSCAPE_OPTIONAL\r
     gnome-vfs-2.0\r

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index f7093192451049434bf2c36540b051f1e9d06233..309d4cdd99e0a72b7456d0be12a5da80a6ab1edc 100644 (file)
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -21,20 +21,24 @@ d2.h
 d2-sbasis.cpp
 d2-sbasis.h
 exception.h
+forward.h
 geom.cpp
 geom.h
 interval.h
 isnan.h
 linear.h
-makefile.in
-Makefile_insert
 matrix.cpp
 matrix.h
+nearest-point.cpp
+nearest-point.h
+numeric
 ord.h
 path.cpp
 path.h
 path-intersection.cpp
 path-intersection.h
+pathvector.cpp
+pathvector.h
 piecewise.cpp
 piecewise.h
 point.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d40a7b8f3a665bcbbb3dd2807f46a67e0a00343..bf2492c5038fa49779307ed5973255cd1772a18d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,209 @@ IF(WIN32)
 ELSEIF(WIN32)\r
     SET(ONLY_WIN)\r
 ENDIF(WIN32)\r
+SET(SP_SRC
+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-font-face.cpp
+sp-font-face.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-glyph-kerning.cpp
+sp-glyph-kerning.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
+)
 \r
 SET(INKSCAPE_SRC\r
 approx-equal.h
@@ -24,7 +227,6 @@ box3d.cpp
 box3d.h
 box3d-side.cpp
 box3d-side.h
-brokenimage.xpm
 color.cpp
 color.h
 color-profile.cpp
@@ -258,203 +460,6 @@ 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
@@ -587,17 +592,19 @@ livarot
 FOREACH(dirlist ${libfolders})\r
   ADD_SUBDIRECTORY(${dirlist})\r
 ENDFOREACH(dirlist)\r
-\r
+
+
+ADD_LIBRARY(sp STATIC ${SP_SRC})\r
 \r
 # make executable for INKSCAPE\r
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
 TARGET_LINK_LIBRARIES(inkscape\r
-       "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
+       "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp\r
 )
 
 # make executable for INKVIEW
 #ADD_EXECUTABLE(inkview inkview.cpp)
 #TARGET_LINK_LIBRARIES(inkview\r
-#      "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
+#      "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp\r
 #)\r
 

diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index 0b33519684b2d7bba6ad6dd4c185ff9e21cb2e04..4e0e9a9c82ee0165b75b46af9e9b7d54955b1def 100644 (file)
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -31,8 +31,6 @@ layer-properties.cpp
 layer-properties.h
 layers-panel.cpp
 layers-panel.h
-makefile.in
-Makefile_insert
 object-attributes.cpp
 object-attributes.h
 rdf.cpp

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index bb37a3c23a21dec986a925f0a21a0434146e5868..28d54d87c79ee045f91f994e00803a0f8842536b 100644 (file)
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -8,6 +8,8 @@ lpe-bendpath.cpp
 lpe-bendpath.h
 lpe-circle_with_radius.cpp
 lpe-circle_with_radius.h
+lpe-constructgrid.cpp
+lpe-constructgrid.h
 lpe-curvestitch.cpp
 lpe-curvestitch.h
 lpe-envelope.cpp
@@ -24,22 +26,23 @@ lpeobject-reference.cpp
 lpeobject-reference.h
 lpe-patternalongpath.cpp
 lpe-patternalongpath.h
+lpe-perp_bisector.cpp
+lpe-perp_bisector.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-tangent_to_curve.cpp
+lpe-tangent_to_curve.h
 lpe-test-doEffect-stack.cpp
 lpe-test-doEffect-stack.h
 lpe-vonkoch.cpp
 lpe-vonkoch.h
 spiro.cpp
 spiro.h
-todo.txt
 )
 

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 4929e3262aa15301ee4a6a0bb6768c94af656e65..85d943000efcda1a742809c6e526e75c00fceb24 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,29 +1,31 @@
 SET(svg_SRC
 css-ostringstream.cpp
 css-ostringstream.h
-css-ostringstream-test.h
-ftos.cpp
-ftos.h
+#css-ostringstream-test.h
+#ftos.cpp
+#ftos.h
 gnome-canvas-bpath-util.cpp
 gnome-canvas-bpath-util.h
 itos.cpp
 path-string.cpp
 path-string.h
 round.cpp
+sp-svg.def
 stringstream.cpp
 stringstream.h
-stringstream-test.h
+#stringstream-test.h
 strip-trailing-zeros.cpp
 strip-trailing-zeros.h
-svg.h
 svg-affine.cpp
 svg-color.cpp
 svg-color.h
-svg-color-test.h
+#svg-color-test.h
+svg.h
 svg-icc-color.h
 svg-length.cpp
 svg-length.h
 svg-path.cpp
-test-stubs.cpp
-test-stubs.h
-)
\ No newline at end of file
+#svg-path-test.h
+#test-stubs.cpp
+#test-stubs.h
+)