From fd70df8246aa298587c90fa5d451c25abe858045 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 22 Jun 2011 14:33:11 +0000 Subject: get cmake working again. (bzr r10334) --- src/CMakeLists.txt | 4 --- src/display/CMakeLists.txt | 19 +++++--------- src/extension/CMakeLists.txt | 3 --- src/filters/CMakeLists.txt | 19 +++----------- src/libnr/CMakeLists.txt | 59 -------------------------------------------- src/libnrtype/CMakeLists.txt | 4 --- src/widgets/CMakeLists.txt | 2 -- 7 files changed, 9 insertions(+), 101 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d048eaa87..1e4ad99e6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,6 @@ set(sp_SRC sp-flowtext.cpp sp-font-face.cpp sp-font.cpp - sp-gaussian-blur.cpp sp-glyph-kerning.cpp sp-glyph.cpp sp-gradient-reference.cpp @@ -85,7 +84,6 @@ set(sp_SRC sp-defs.h sp-desc.h sp-ellipse.h - sp-filter-fns.h sp-filter-primitive.h sp-filter-reference.h sp-filter-units.h @@ -95,8 +93,6 @@ set(sp_SRC sp-flowtext.h sp-font-face.h sp-font.h - sp-gaussian-blur-fns.h - sp-gaussian-blur.h sp-glyph-kerning.h sp-glyph.h sp-gradient-fns.h diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 30643550f..e78ddd59f 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -1,5 +1,6 @@ set(display_SRC + cairo-utils.cpp canvas-arena.cpp canvas-axonomgrid.cpp canvas-bpath.cpp @@ -11,7 +12,6 @@ set(display_SRC gnome-canvas-acetate.cpp grayscale.cpp guideline.cpp - inkscape-cairo.cpp nr-3dutils.cpp nr-arena-glyphs.cpp nr-arena-group.cpp @@ -28,7 +28,6 @@ set(display_SRC nr-filter-displacement-map.cpp nr-filter-flood.cpp nr-filter-gaussian.cpp - nr-filter-getalpha.cpp nr-filter-image.cpp nr-filter-merge.cpp nr-filter-morphology.cpp @@ -43,12 +42,9 @@ set(display_SRC nr-filter-utils.cpp nr-filter.cpp nr-light.cpp - nr-plain-stuff-gdk.cpp - nr-plain-stuff.cpp + nr-style.cpp nr-svgfonts.cpp nr-svgfonts.h - pixblock-scaler.cpp - pixblock-transform.cpp snap-indicator.cpp sodipodi-ctrl.cpp sodipodi-ctrlrect.cpp @@ -61,6 +57,8 @@ set(display_SRC # ------- # Headers + cairo-templates.h + cairo-utils.h canvas-arena.h canvas-axonomgrid.h canvas-bpath.h @@ -70,10 +68,10 @@ set(display_SRC canvas-text.h curve-test.h curve.h + display-forward.h gnome-canvas-acetate.h grayscale.h guideline.h - inkscape-cairo.h nr-3dutils.h nr-arena-forward.h nr-arena-glyphs.h @@ -91,12 +89,10 @@ set(display_SRC nr-filter-displacement-map.h nr-filter-flood.h nr-filter-gaussian.h - nr-filter-getalpha.h nr-filter-image.h nr-filter-merge.h nr-filter-morphology.h nr-filter-offset.h - nr-filter-pixops.h nr-filter-primitive.h nr-filter-skeleton.h nr-filter-slot.h @@ -109,10 +105,7 @@ set(display_SRC nr-filter.h nr-light-types.h nr-light.h - nr-plain-stuff-gdk.h - nr-plain-stuff.h - pixblock-scaler.h - pixblock-transform.h + nr-style.h rendermode.h snap-indicator.h sodipodi-ctrl.h diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 60de65416..5ccb5c984 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -136,15 +136,12 @@ set(extension_SRC internal/pov-out.h internal/svg.h internal/svgz.h - internal/win32.h script/InkscapeScript.h ) if(WIN32) list(APPEND extension_SRC - internal/win32.cpp - internal/win32.h ) endif() diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index 72e0bba78..7c698777d 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -2,14 +2,15 @@ set(filters_SRC blend.cpp colormatrix.cpp - componenttransfer.cpp componenttransfer-funcnode.cpp + componenttransfer.cpp composite.cpp convolvematrix.cpp diffuselighting.cpp displacementmap.cpp distantlight.cpp flood.cpp + gaussian-blur.cpp image.cpp merge.cpp mergenode.cpp @@ -23,40 +24,26 @@ set(filters_SRC # ------- # Headers - blend-fns.h blend.h - colormatrix-fns.h colormatrix.h - componenttransfer-fns.h componenttransfer-funcnode.h componenttransfer.h - composite-fns.h composite.h - convolvematrix-fns.h convolvematrix.h - diffuselighting-fns.h diffuselighting.h - displacementmap-fns.h displacementmap.h distantlight.h - flood-fns.h flood.h - image-fns.h + gaussian-blur.h image.h - merge-fns.h merge.h mergenode.h - morphology-fns.h morphology.h - offset-fns.h offset.h pointlight.h - specularlighting-fns.h specularlighting.h spotlight.h - tile-fns.h tile.h - turbulence-fns.h turbulence.h ) diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt index 994c5d348..b310068c0 100644 --- a/src/libnr/CMakeLists.txt +++ b/src/libnr/CMakeLists.txt @@ -1,31 +1,12 @@ set(nr_SRC # in-svg-plane-test.cpp - nr-blit.cpp - nr-compose.cpp - nr-compose-transform.cpp - nr-gradient.cpp - nr-matrix.cpp - nr-matrix-div.cpp - nr-matrix-fns.cpp - nr-matrix-rotate-ops.cpp nr-object.cpp - nr-pixblock.cpp - nr-pixblock-line.cpp - nr-pixblock-pattern.cpp - nr-pixblock-pixel.cpp nr-point-fns.cpp # nr-point-fns-test.cpp nr-rect.cpp nr-rect-l.cpp - nr-rotate-fns.cpp # nr-rotate-fns-test.cpp - nr-rotate-matrix-ops.cpp - nr-scale-matrix-ops.cpp - nr-scale-translate-ops.cpp - nr-translate-matrix-ops.cpp - nr-translate-rotate-ops.cpp - nr-translate-scale-ops.cpp #nr-translate-test.cpp nr-types.cpp # nr-types-test.cpp @@ -36,63 +17,23 @@ set(nr_SRC # Headers # in-svg-plane-test.h in-svg-plane.h - nr-blit.h - nr-compose-reference.h - nr-compose-test.h - nr-compose-transform.h - nr-compose.h nr-convert2geom.h - nr-convex-hull-ops.h - nr-convex-hull.h nr-coord.h nr-dim2.h nr-forward.h - nr-gradient.h nr-i-coord.h nr-macros.h - nr-matrix-div.h - nr-matrix-fns.h - nr-matrix-ops.h - nr-matrix-rotate-ops.h - nr-matrix-scale-ops.h - nr-matrix-test.h - nr-matrix-translate-ops.h - nr-matrix.h - nr-maybe.h nr-object.h - nr-path-code.h - nr-pixblock-line.h - nr-pixblock-pattern.h - nr-pixblock-pixel.h - nr-pixblock.h - nr-pixops.h # nr-point-fns-test.h nr-point-fns.h nr-point-l.h - nr-point-matrix-ops.h nr-point-ops.h nr-point.h nr-rect-l.h nr-rect-ops.h nr-rect.h nr-render.h - nr-rotate-fns-test.h - nr-rotate-fns.h - nr-rotate-matrix-ops.h - nr-rotate-ops.h - nr-rotate-test.h - nr-rotate.h - nr-scale-matrix-ops.h - nr-scale-ops.h - nr-scale-test.h - nr-scale-translate-ops.h - nr-scale.h - nr-translate-matrix-ops.h - nr-translate-ops.h - nr-translate-rotate-ops.h - nr-translate-scale-ops.h # nr-translate-test.h - nr-translate.h # nr-types-test.h nr-types.h nr-values.h diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt index 835665761..3d52e2c4e 100644 --- a/src/libnrtype/CMakeLists.txt +++ b/src/libnrtype/CMakeLists.txt @@ -12,13 +12,11 @@ set(nrtype_SRC Layout-TNG-Scanline-Makers.cpp nr-type-pos-def.cpp nr-type-primitives.cpp - RasterFont.cpp TextWrapper.cpp FontFactory.h Layout-TNG-Scanline-Maker.h Layout-TNG.h - RasterFont.h TextWrapper.h boundary-type.h font-glyph.h @@ -32,8 +30,6 @@ set(nrtype_SRC one-box.h one-glyph.h one-para.h - raster-glyph.h - raster-position.h text-boundary.h ) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index d9e05f06a..1a203afc6 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -20,7 +20,6 @@ set(widgets_SRC sp-color-gtkselector.cpp sp-color-icc-selector.cpp sp-color-notebook.cpp - sp-color-preview.cpp sp-color-scales.cpp sp-color-selector.cpp sp-color-slider.cpp @@ -56,7 +55,6 @@ set(widgets_SRC sp-color-gtkselector.h sp-color-icc-selector.h sp-color-notebook.h - sp-color-preview.h sp-color-scales.h sp-color-selector.h sp-color-slider.h -- cgit v1.2.3