diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-12 18:27:29 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-12 18:27:29 +0000 |
| commit | 0ddedab9c6185028661dcaaac9f6fbca4c9e93fc (patch) | |
| tree | bbc7867e964a5b358b7b144df7c434941f7f06bf /src | |
| parent | support python3.x for other i18n scripts (diff) | |
| download | inkscape-0ddedab9c6185028661dcaaac9f6fbca4c9e93fc.tar.gz inkscape-0ddedab9c6185028661dcaaac9f6fbca4c9e93fc.zip | |
work in progress cmake commit:
- cmake now builds all files that automake does but does NOT link yet
- inlcudes nasty hard coded paths and libs (will replace once linking works)
(bzr r10272)
Diffstat (limited to 'src')
48 files changed, 1320 insertions, 1196 deletions
diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt index 3c8669a9d..91c14db8b 100644 --- a/src/2geom/CMakeLists.txt +++ b/src/2geom/CMakeLists.txt @@ -1,127 +1,127 @@ -SET(2GEOM_SRC -svg-path.h -svg-path.cpp -svg-path-parser.h -svg-path-parser.cpp - -ord.h - -#nearestpoint.cpp -nearest-point.cpp -nearest-point.h - -bezier-curve.h -circle.cpp -circle.h -curve.h -curves.h -curve-helpers.cpp -ellipse.cpp -ellipse.h -elliptical-arc.cpp -elliptical-arc.h -hvlinesegment.h -sbasis-curve.h -path.cpp -path.h -path-intersection.cpp -path-intersection.h -pathvector.cpp -pathvector.h - -forward.h - -shape.cpp -shape.h -region.cpp -region.h -crossing.h -crossing.cpp -sweep.cpp -sweep.h - -poly.cpp -poly.h -poly-dk-solve.cpp -poly-dk-solve.h -poly-laguerre-solve.cpp -poly-laguerre-solve.h - -quadtree.cpp -quadtree.h - -matrix.cpp -matrix.h -transforms.cpp -transforms.h - -point.h -point.cpp -point-l.h - -coord.h - -d2.h -d2-sbasis.h -d2-sbasis.cpp -rect.h - -piecewise.h -piecewise.cpp - -sbasis.cpp -sbasis.h -sbasis-2d.h -sbasis-2d.cpp -sbasis-geometric.cpp -sbasis-geometric.h -sbasis-math.h -sbasis-math.cpp -sbasis-poly.cpp -sbasis-poly.h -#chebyshev.cpp # requires gsl, not useful, I think -#chebyshev.h -sbasis-roots.cpp -sbasis-to-bezier.cpp -sbasis-to-bezier.h - -bezier-to-sbasis.h - -basic-intersection.h -basic-intersection.cpp -recursive-bezier-intersection.cpp - -geom.cpp -geom.h - -#utils.cpp -utils.h -exception.h -angle.h - -bezier-utils.cpp -bezier-utils.h -choose.h -circulator.h -conjugate_gradient.cpp -conjugate_gradient.h -convex-cover.cpp -convex-cover.h -solve-bezier-one-d.cpp -solve-bezier-parametric.cpp -solver.h -sturm.h -svg-elliptical-arc.cpp -svg-elliptical-arc.h - -#arc-length.cpp -#arc-length.h - -numeric/matrix.cpp +set(2GEOM_SRC + affine.cpp + basic-intersection.cpp + bezier-clipping.cpp + bezier-curve.cpp + bezier-utils.cpp + circle-circle.cpp + circle.cpp + conic_section_clipper_impl.cpp + conicsec.cpp + conjugate_gradient.cpp + convex-cover.cpp + crossing.cpp + curve.cpp + d2-sbasis.cpp + ellipse.cpp + elliptical-arc.cpp + geom.cpp + line.cpp + nearest-point.cpp + numeric/matrix.cpp + path-intersection.cpp + path.cpp + pathvector.cpp + piecewise.cpp + point.cpp + poly.cpp + quadtree.cpp + recursive-bezier-intersection.cpp + region.cpp + sbasis-2d.cpp + sbasis-geometric.cpp + sbasis-math.cpp + sbasis-poly.cpp + sbasis-roots.cpp + sbasis-to-bezier.cpp + sbasis.cpp + shape.cpp + solve-bezier-one-d.cpp + solve-bezier-parametric.cpp + svg-elliptical-arc.cpp + svg-path-parser.cpp + svg-path.cpp + sweep.cpp + transforms.cpp + utils.cpp + + affine.h + angle.h + basic-intersection.h + bezier-curve.h + bezier-to-sbasis.h + bezier-utils.h + bezier.h + choose.h + circle.h + circulator.h + concepts.h + conic_section_clipper.h + conic_section_clipper_cr.h + conic_section_clipper_impl.h + conicsec.h + conjugate_gradient.h + convex-cover.h + coord.h + crossing.h + curve.h + curves.h + d2-sbasis.h + d2.h + ellipse.h + elliptical-arc.h + exception.h + forward.h + geom.h + hvlinesegment.h + interval.h + isnan.h + line.h + linear.h + math-utils.h + nearest-point.h + ord.h + path-intersection.h + path.h + pathvector.h + piecewise.h + point-l.h + point-ops.h + point.h + poly.h + quadtree.h + ray.h + rect.h + region.h + sbasis-2d.h + sbasis-curve.h + sbasis-geometric.h + sbasis-math.h + sbasis-poly.h + sbasis-to-bezier.h + sbasis.h + shape.h + solver.h + sturm.h + svg-elliptical-arc.h + svg-path-parser.h + svg-path.h + sweep.h + transforms.h + utils.h + + numeric/fitting-model.h + numeric/fitting-tool.h + numeric/linear_system.h + numeric/matrix.h + numeric/symmetric-matrix-fs-operation.h + numeric/symmetric-matrix-fs-trace.h + numeric/symmetric-matrix-fs.h + numeric/vector.h ) # make lib for 2geom -ADD_LIBRARY(2geom STATIC ${2GEOM_SRC}) +add_library(2geom STATIC ${2GEOM_SRC}) #TARGET_LINK_LIBRARIES(2geom blas gsl) -TARGET_LINK_LIBRARIES(2geom ${INKSCAPE_LIBS}) +target_link_libraries(2geom ${INKSCAPE_LIBS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f03f22c80..4bd93db12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,264 +1,348 @@ -IF(WIN32)
- SET(ONLY_WIN
- registrytool.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-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-stop.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-pair.cpp
+ sp-conn-end.cpp
+ sp-cursor.cpp
+ sp-defs.cpp
+ sp-desc.cpp
+ sp-ellipse.cpp
+ sp-filter-primitive.cpp
+ sp-filter-reference.cpp
+ sp-filter.cpp
+ sp-flowdiv.cpp
+ sp-flowregion.cpp
+ 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
+ sp-gradient.cpp
+ sp-guide.cpp
+ sp-image.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-item.cpp
+ sp-line.cpp
+ sp-lpe-item.cpp
+ sp-mask.cpp
+ sp-metadata.cpp
+ sp-metrics.cpp
+ sp-missing-glyph.cpp
+ sp-namedview.cpp
+ sp-object-group.cpp
+ sp-object-repr.cpp
+ sp-object.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-script.cpp
+ sp-shape.cpp
+ sp-skeleton.cpp
+ sp-spiral.cpp
+ sp-star.cpp
+ sp-stop.cpp
+ sp-string.cpp
+ sp-style-elem.cpp
+ sp-switch.cpp
+ sp-symbol.cpp
+ sp-text.cpp
+ sp-title.cpp
+ sp-tref-reference.cpp
+ sp-tref.cpp
+ sp-tspan.cpp
+ sp-use-reference.cpp
+ sp-use.cpp
+ spiral-context.cpp
+ splivarot.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
-connection-points.cpp
-connector-context.cpp
-console-output-undo-observer.cpp
-context-fns.cpp
-#deptool.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}
+set(INKSCAPE_SRC
+ arc-context.cpp
+ attributes.cpp
+ axis-manip.cpp
+ box3d-context.cpp
+ box3d-side.cpp
+ box3d.cpp
+ color-profile.cpp
+ color.cpp
+ common-context.cpp
+ composite-undo-stack-observer.cpp
+ conditions.cpp
+ conn-avoid-ref.cpp
+ connection-points.cpp
+ connector-context.cpp
+ console-output-undo-observer.cpp
+ context-fns.cpp
+ desktop-events.cpp
+ desktop-handles.cpp
+ desktop-style.cpp
+ desktop.cpp
+ device-manager.cpp
+ dir-util.cpp
+ document-subset.cpp
+ document-undo.cpp
+ document.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
+ extract-uri.cpp
+ file.cpp
+ filter-chemistry.cpp
+ filter-enums.cpp
+ fixes.cpp
+ flood-context.cpp
+ gc-anchored.cpp
+ gc-finalized.cpp
+ gc.cpp
+ gradient-chemistry.cpp
+ gradient-context.cpp
+ gradient-drag.cpp
+ graphlayout.cpp
+ guide-snapper.cpp
+ help.cpp
+ id-clash.cpp
+ ige-mac-menu.c
+ ink-action.cpp
+ ink-comboboxentry-action.cpp
+ inkscape-version.cpp
+ inkscape.cpp
+ inkscape.rc
+ inkview.cpp
+ inkview.rc
+ interface.cpp
+ knot-holder-entity.cpp
+ knot.cpp
+ knotholder.cpp
+ layer-fns.cpp
+ layer-manager.cpp
+ line-geometry.cpp
+ line-snapper.cpp
+ lpe-tool-context.cpp
+ main-cmdlineact.cpp
+ main.cpp
+ marker.cpp
+ measure-context.cpp
+ media.cpp
+ message-context.cpp
+ message-stack.cpp
+ mod360.cpp
+ object-edit.cpp
+ object-hierarchy.cpp
+ object-snapper.cpp
+ path-chemistry.cpp
+ pen-context.cpp
+ pencil-context.cpp
+ persp3d-reference.cpp
+ persp3d.cpp
+ perspective-line.cpp
+ preferences.cpp
+ prefix.cpp
+ print.cpp
+ profile-manager.cpp
+ proj_pt.cpp
+ rdf.cpp
+ rect-context.cpp
+ removeoverlap.cpp
+ resource-manager.cpp
+ rubberband.cpp
+ satisfied-guide-cns.cpp
+ selcue.cpp
+ select-context.cpp
+ selection-chemistry.cpp
+ selection-describer.cpp
+ selection.cpp
+ seltrans-handles.cpp
+ seltrans.cpp
+ shape-editor.cpp
+ shortcuts.cpp
+ snap-preferences.cpp
+ snap.cpp
+ snapped-curve.cpp
+ snapped-line.cpp
+ snapped-point.cpp
+ snapper.cpp
+ spray-context.cpp
+ star-context.cpp
+ style.cpp
+ svg-view-widget.cpp
+ svg-view.cpp
+ text-chemistry.cpp
+ text-context.cpp
+ text-editing.cpp
+ tools-switch.cpp
+ transf_mat_3x4.cpp
+ tweak-context.cpp
+ unclump.cpp
+ unicoderange.cpp
+ uri-references.cpp
+ uri.cpp
+ vanishing-point.cpp
+ verbs.cpp
+ version.cpp
+ zoom-context.cpp
)
+
+if(WIN32)
+ list(APPEND INKSCAPE_SRC
+ registrytool.cpp
+ #deptool.cpp
+ winmain.cpp
+ )
+endif()
+
# All folders for internal inkscape
-SET(internalfolders
-#algorithms
-#api
-bind
-debug
-dialogs
-display
-dom
-extension
-filters
-graphlayout
-helper
-inkjar
-io
-jabber_whiteboard
-live_effects
-pedro
-removeoverlap
-svg
-trace
-#traits
-ui
-util
-widgets
-xml
-2geom
+set(internalfolders
+ #algorithms
+ #api
+ bind
+ debug
+ dialogs
+ display
+ dom
+ extension
+ filters
+ helper
+ io
+ jabber_whiteboard
+ live_effects
+ pedro
+ svg
+ trace
+ #traits
+ ui
+ util
+ widgets
+ xml
+ 2geom
)
-SET(libfolders
-# Directories containing lists files that describe building internal libraries
-libavoid
-libcola
-libcroco
-libgdl
-libnr
-libnrtype
-libvpsc
-livarot
+
+set(libfolders
+ # Directories containing lists files that describe building internal libraries
+ libavoid
+ libcola
+ libcroco
+ libgdl
+ libnr
+ libnrtype
+ libvpsc
+ livarot
)
-SET(dirs ${internalfolders} ${libfolders}
+set(dirs
+ ${internalfolders}
+ ${libfolders}
)
-FOREACH(srclistsrc ${dirs})
- ADD_SUBDIRECTORY(${srclistsrc})
-ENDFOREACH(srclistsrc)
+foreach(srclistsrc ${dirs})
+ add_subdirectory(${srclistsrc})
+endforeach()
-SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})
+set(INKSCAPE_SRC
+ ${INKSCAPE_SRC}
+ ${GlibOutput}
+)
-ADD_LIBRARY(sp STATIC ${SP_SRC})
-TARGET_LINK_LIBRARIES(sp
-nr nrtype avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}
+add_library(sp STATIC ${SP_SRC})
+target_link_libraries(sp
+ nr
+ nrtype
+ avoid
+ cola
+ croco
+ gdl
+ vpsc
+ livarot
+ ${internalfolders}
+ ${INKSCAPE_LIBS}
)
+
# make executable for INKSCAPE
-ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})
-TARGET_LINK_LIBRARIES(inkscape
-nr nrtype sp avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}
+add_executable(inkscape ${INKSCAPE_SRC})
+
+target_link_libraries(inkscape
+ nr
+ nrtype
+ sp
+ avoid
+ cola
+ croco
+ gdl
+ vpsc
+ livarot
+ ${internalfolders}
+ ${INKSCAPE_LIBS}
+
+
+ # system libs
+ xslt
+ gtkspell
+ gsl
+ gslcblas
+ gtkmm-2.4
+ atkmm-1.6
+ gdkmm-2.4
+ giomm-2.4
+ pangomm-1.4
+ gtk-x11-2.0
+ glibmm-2.4
+ cairomm-1.0
+ sigc-2.0
+ atk-1.0
+ gio-2.0
+ png
+ X11
+ xml2
+ dl
+ gomp
+ popt
+ aspell
+ gnomevfs-2
+ gconf-2
+ pangoft2-1.0
+ fontconfig
+ freetype
+ z
+ Magick++
+ MagickCore
+ gc
+ lcms
+ poppler-glib
+ gdk-x11-2.0
+ poppler
+ pangocairo-1.0
+ gdk_pixbuf-2.0
+ png14
+ m
+ pango-1.0
+ cairo
+ gmodule-2.0
+ gobject-2.0
+ gthread-2.0
+ rt
+ glib-2.0
+
)
# make executable for INKVIEW
diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt index a6b5b6883..08b7876c2 100644 --- a/src/bind/CMakeLists.txt +++ b/src/bind/CMakeLists.txt @@ -1,7 +1,6 @@ -SET(bind_SRC -dobinding.cpp -javabind.cpp +set(bind_SRC + dobinding.cpp + javabind.cpp ) -ADD_LIBRARY(bind STATIC ${bind_SRC}) -TARGET_LINK_LIBRARIES(bind -${INKSCAPE_LIBS})
\ No newline at end of file +add_library(bind STATIC ${bind_SRC}) +target_link_libraries(bind ${INKSCAPE_LIBS}) diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 26c4e6934..2dab10144 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -1,12 +1,13 @@ -SET(debug_SRC -demangle.cpp -heap.cpp -log-display-config.cpp -logger.cpp -sysv-heap.cpp -timestamp.cpp -gdk-event-latency-tracker.cpp + +set(debug_SRC + demangle.cpp + heap.cpp + log-display-config.cpp + logger.cpp + sysv-heap.cpp + timestamp.cpp + gdk-event-latency-tracker.cpp ) -ADD_LIBRARY(debug STATIC ${debug_SRC}) -TARGET_LINK_LIBRARIES(debug -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(debug STATIC ${debug_SRC}) +target_link_libraries(debug 2geom ${INKSCAPE_LIBS}) diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt index 9bcb1cd5a..aa8f836d5 100644 --- a/src/dialogs/CMakeLists.txt +++ b/src/dialogs/CMakeLists.txt @@ -1,25 +1,13 @@ -SET(dialogs_SRC -clonetiler.cpp -dialog-events.cpp -export.cpp -extensions.cpp -fill-style.cpp -find.cpp -guidelinedialog.cpp -iconpreview.cpp -in-dt-coordsys.cpp -item-properties.cpp -layer-properties.cpp -layers-panel.cpp -object-attributes.cpp -rdf.cpp -sp-attribute-widget.cpp -stroke-style.cpp -swatches.cpp -text-edit.cpp -unclump.cpp -xml-tree.cpp +set(dialogs_SRC + clonetiler.cpp + dialog-events.cpp + export.cpp + find.cpp + item-properties.cpp + object-attributes.cpp + spellcheck.cpp + text-edit.cpp + xml-tree.cpp ) -ADD_LIBRARY(dialogs STATIC ${dialogs_SRC}) -TARGET_LINK_LIBRARIES(dialogs -2geom ${INKSCAPE_LIBS}) +add_library(dialogs STATIC ${dialogs_SRC}) +target_link_libraries(dialogs 2geom ${INKSCAPE_LIBS}) diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 9fa2304be..1d3e09200 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -1,59 +1,66 @@ -SET(display_SRC -canvas-arena.cpp -canvas-axonomgrid.cpp -canvas-bpath.cpp -canvas-grid.cpp -canvas-temporary-item.cpp -canvas-temporary-item-list.cpp -curve.cpp -gnome-canvas-acetate.cpp -guideline.cpp -inkscape-cairo.cpp -nr-3dutils.cpp -nr-arena.cpp -nr-arena-glyphs.cpp -nr-arena-group.cpp -nr-arena-image.cpp -nr-arena-item.cpp -nr-arena-shape.cpp -nr-filter-blend.cpp -nr-filter-colormatrix.cpp -nr-filter-component-transfer.cpp -nr-filter-composite.cpp -nr-filter-convolve-matrix.cpp -nr-filter.cpp -nr-filter-diffuselighting.cpp -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 -nr-filter-offset.cpp -nr-filter-primitive.cpp -nr-filter-skeleton.cpp -nr-filter-slot.cpp -nr-filter-specularlighting.cpp -nr-filter-tile.cpp -nr-filter-turbulence.cpp -nr-filter-units.cpp -nr-filter-utils.cpp -nr-light.cpp -nr-plain-stuff.cpp -nr-plain-stuff-gdk.cpp -nr-svgfonts.h -pixblock-scaler.cpp -pixblock-transform.cpp -snap-indicator.cpp -sodipodi-ctrl.cpp -sodipodi-ctrlrect.cpp -sp-canvas.cpp -sp-canvas-util.cpp -sp-ctrlline.cpp -sp-ctrlquadr.cpp -#testnr.cpp +set(display_SRC + canvas-arena.cpp + canvas-axonomgrid.cpp + canvas-bpath.cpp + canvas-grid.cpp + canvas-temporary-item-list.cpp + canvas-temporary-item.cpp + canvas-text.cpp + curve.cpp + gnome-canvas-acetate.cpp + grayscale.cpp + guideline.cpp + inkscape-cairo.cpp + nr-3dutils.cpp + nr-arena-glyphs.cpp + nr-arena-group.cpp + nr-arena-image.cpp + nr-arena-item.cpp + nr-arena-shape.cpp + nr-arena.cpp + nr-filter-blend.cpp + nr-filter-colormatrix.cpp + nr-filter-component-transfer.cpp + nr-filter-composite.cpp + nr-filter-convolve-matrix.cpp + nr-filter-diffuselighting.cpp + 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 + nr-filter-offset.cpp + nr-filter-primitive.cpp + nr-filter-skeleton.cpp + nr-filter-slot.cpp + nr-filter-specularlighting.cpp + nr-filter-tile.cpp + nr-filter-turbulence.cpp + nr-filter-units.cpp + nr-filter-utils.cpp + nr-filter.cpp + nr-light.cpp + nr-plain-stuff-gdk.cpp + nr-plain-stuff.cpp + nr-svgfonts.cpp + nr-svgfonts.h + pixblock-scaler.cpp + pixblock-transform.cpp + snap-indicator.cpp + sodipodi-ctrl.cpp + sodipodi-ctrlrect.cpp + sp-canvas-util.cpp + sp-canvas.cpp + sp-ctrlline.cpp + sp-ctrlpoint.cpp + sp-ctrlquadr.cpp ) -ADD_LIBRARY(display STATIC ${display_SRC}) -TARGET_LINK_LIBRARIES(display -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +include_directories( + "${CMAKE_SOURCE_DIR}/src" +) + +add_library(display STATIC ${display_SRC}) +target_link_libraries(display 2geom ${INKSCAPE_LIBS}) diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt index 7c434eb77..53609d241 100644 --- a/src/dom/CMakeLists.txt +++ b/src/dom/CMakeLists.txt @@ -1,38 +1,38 @@ -SET(domfolders -io -odf -util -#work +set(domfolders + io + odf + util + #work ) -FOREACH(domlistsrc ${domfolders}) - ADD_SUBDIRECTORY(${domlistsrc}) -ENDFOREACH(domlistsrc) +foreach(domlistsrc ${domfolders}) + add_subdirectory(${domlistsrc}) +endforeach() -SET(dom_SRC -cssreader.cpp -domimpl.cpp -domptr.cpp -domstring.cpp -lsimpl.cpp -prop-css2.cpp -#prop-css.cpp -#prop-svg.cpp -smilimpl.cpp -svgimpl.cpp -svgreader.cpp -ucd.cpp -uri.cpp -xmlreader.cpp -xmlwriter.cpp -xpathimpl.cpp -xpathparser.cpp -xpathtoken.cpp -${dom_io_SRC} -${dom_odf_SRC} -${dom_util_SRC} -#${dom_work_SRC} +set(dom_SRC + cssreader.cpp + domimpl.cpp + domptr.cpp + domstring.cpp + lsimpl.cpp + prop-css2.cpp + prop-css.cpp + prop-svg.cpp + smilimpl.cpp + svgimpl.cpp + svgreader.cpp + ucd.cpp + uri.cpp + xmlreader.cpp + xmlwriter.cpp + xpathimpl.cpp + xpathparser.cpp + xpathtoken.cpp + ${dom_io_SRC} + ${dom_odf_SRC} + ${dom_util_SRC} + #${dom_work_SRC} ) -ADD_LIBRARY(dom STATIC ${dom_SRC}) -TARGET_LINK_LIBRARIES(dom -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(dom STATIC ${dom_SRC}) +target_link_libraries(dom 2geom ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/dom/io/CMakeLists.txt b/src/dom/io/CMakeLists.txt index c8a98466d..0b0b4630d 100644 --- a/src/dom/io/CMakeLists.txt +++ b/src/dom/io/CMakeLists.txt @@ -1,11 +1,11 @@ -SET(dom_io_SRC -base64stream.cpp -bufferstream.cpp -domstream.cpp -gzipstream.cpp -httpclient.cpp -socket.cpp -stringstream.cpp -uristream.cpp +set(dom_io_SRC + base64stream.cpp + bufferstream.cpp + domstream.cpp + gzipstream.cpp + httpclient.cpp + socket.cpp + stringstream.cpp + uristream.cpp ) diff --git a/src/dom/odf/CMakeLists.txt b/src/dom/odf/CMakeLists.txt index e0cb76060..089f65fbf 100644 --- a/src/dom/odf/CMakeLists.txt +++ b/src/dom/odf/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(dom_odf_SRC -odfdocument.cpp -#SvgOdg.cpp +set(dom_odf_SRC + odfdocument.cpp + #SvgOdg.cpp ) diff --git a/src/dom/util/CMakeLists.txt b/src/dom/util/CMakeLists.txt index 167e980c9..e5f583fa5 100644 --- a/src/dom/util/CMakeLists.txt +++ b/src/dom/util/CMakeLists.txt @@ -1,6 +1,6 @@ -SET(dom_util_SRC -digest.cpp -thread.cpp -ziptool.cpp +set(dom_util_SRC + digest.cpp + thread.cpp + ziptool.cpp ) diff --git a/src/dom/work/CMakeLists.txt b/src/dom/work/CMakeLists.txt index 8cd4676cf..52552c8b9 100644 --- a/src/dom/work/CMakeLists.txt +++ b/src/dom/work/CMakeLists.txt @@ -1,12 +1,12 @@ -SET(dom_work_SRC -#testdom.cpp -#testhttp.cpp -#testjs.cpp -#testodf.cpp -#testsvg.cpp -#testuri.cpp -#testxpath.cpp -#testzip.cpp -#xpathtests.cpp +set(dom_work_SRC + #testdom.cpp + #testhttp.cpp + #testjs.cpp + #testodf.cpp + #testsvg.cpp + #testuri.cpp + #testxpath.cpp + #testzip.cpp + #xpathtests.cpp ) diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index cd640d3d0..73697fbe7 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -1,41 +1,41 @@ -SET(extfolders -#dxf2svg -implementation -internal -internal/bitmap -internal/filter -internal/pdfinput -param -script +set(extfolders + #dxf2svg + implementation + internal + internal/bitmap + internal/filter + internal/pdfinput + param + script ) -FOREACH(extlistsrc ${extfolders}) - ADD_SUBDIRECTORY(${extlistsrc}) -ENDFOREACH(extlistsrc) +foreach(extlistsrc ${extfolders}) + add_subdirectory(${extlistsrc}) +endforeach() -SET(extension_SRC -db.cpp -dependency.cpp -effect.cpp -error-file.cpp -execution-env.cpp -extension.cpp -init.cpp -input.cpp -output.cpp -patheffect.cpp -prefdialog.cpp -print.cpp -system.cpp -timer.cpp -#${extension_dxf2svg_SRC} -${extension_implementation_SRC} -${extension_internal_bitmap_SRC} -${extension_internal_filter_SRC} -${extension_internal_pdfinput_SRC} -${extension_param_SRC} -${extension_script_SRC} +set(extension_SRC + db.cpp + dependency.cpp + effect.cpp + error-file.cpp + execution-env.cpp + extension.cpp + init.cpp + input.cpp + output.cpp + patheffect.cpp + prefdialog.cpp + print.cpp + system.cpp + timer.cpp + #${extension_dxf2svg_SRC} + ${extension_implementation_SRC} + ${extension_internal_bitmap_SRC} + ${extension_internal_filter_SRC} + ${extension_internal_pdfinput_SRC} + ${extension_param_SRC} + ${extension_script_SRC} ) -ADD_LIBRARY(extension STATIC ${extension_SRC}) -TARGET_LINK_LIBRARIES(extension -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(extension STATIC ${extension_SRC}) +target_link_libraries(extension 2geom ${INKSCAPE_LIBS}) diff --git a/src/extension/dxf2svg/CMakeLists.txt b/src/extension/dxf2svg/CMakeLists.txt index b755d7f44..0ff0eaec0 100644 --- a/src/extension/dxf2svg/CMakeLists.txt +++ b/src/extension/dxf2svg/CMakeLists.txt @@ -1,11 +1,11 @@ -SET(extension_dxf2svg_SRC -#aci2rgb.cpp -#entities2elements.cpp -#tables2svg_info.cpp -#blocks.cpp -#entities.cpp -#tables.cpp -#dxf2svg.cpp -#read_dxf.cpp -#test_dxf.cpp +set(extension_dxf2svg_SRC + #aci2rgb.cpp + #entities2elements.cpp + #tables2svg_info.cpp + #blocks.cpp + #entities.cpp + #tables.cpp + #dxf2svg.cpp + #read_dxf.cpp + #test_dxf.cpp ) diff --git a/src/extension/implementation/CMakeLists.txt b/src/extension/implementation/CMakeLists.txt index 87e1b2541..dcdf092c2 100644 --- a/src/extension/implementation/CMakeLists.txt +++ b/src/extension/implementation/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(extension_implementation_SRC -implementation.cpp -xslt.cpp -script.cpp +set(extension_implementation_SRC + implementation.cpp + xslt.cpp + script.cpp ) diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt index 8b23cb0ac..d13ec9f74 100644 --- a/src/extension/internal/CMakeLists.txt +++ b/src/extension/internal/CMakeLists.txt @@ -1,31 +1,29 @@ -IF(WIN32) -SET(EXT_INT_WIN -win32.cpp +set(extension_internal_SRC + bluredge.cpp + cairo-png-out.cpp + cairo-ps-out.cpp + cairo-render-context.cpp + cairo-renderer.cpp + cairo-renderer-pdf-out.cpp + emf-win32-inout.cpp + emf-win32-print.cpp + gdkpixbuf-input.cpp + gimpgrad.cpp + grid.cpp + latex-pstricks.cpp + latex-pstricks-out.cpp + odf.cpp + latex-text-renderer.cpp + pdf-input-cairo.cpp + pov-out.cpp + javafx-out.cpp + svg.cpp + svgz.cpp + wpg-input.cpp ) -ENDIF(WIN32) -SET(extension_internal_SRC -bluredge.cpp -cairo-png-out.cpp -cairo-ps-out.cpp -cairo-render-context.cpp -cairo-renderer.cpp -cairo-renderer-pdf-out.cpp -emf-win32-inout.cpp -emf-win32-print.cpp -gdkpixbuf-input.cpp -gimpgrad.cpp -grid.cpp -latex-pstricks.cpp -latex-pstricks-out.cpp -odf.cpp -pdfinput -latex-text-renderer.cpp -pdf-input-cairo.cpp -pov-out.cpp -javafx-out.cpp -svg.cpp -svgz.cpp -wpg-input.cpp -${EXT_INT_WIN} -) +if(WIN32) + list(APPEND extension_internal_SRC + win32.cpp + ) +endif() diff --git a/src/extension/internal/bitmap/CMakeLists.txt b/src/extension/internal/bitmap/CMakeLists.txt index 8aec17492..a273804ba 100644 --- a/src/extension/internal/bitmap/CMakeLists.txt +++ b/src/extension/internal/bitmap/CMakeLists.txt @@ -1,37 +1,37 @@ -SET(extension_internal_bitmap_SRC -adaptiveThreshold.cpp -addNoise.cpp -blur.cpp -channel.cpp -charcoal.cpp -colorize.cpp -contrast.cpp -cycleColormap.cpp -despeckle.cpp -edge.cpp -emboss.cpp -enhance.cpp -equalize.cpp -gaussianBlur.cpp -imagemagick.cpp -implode.cpp -levelChannel.cpp -level.cpp -medianFilter.cpp -modulate.cpp -negate.cpp -normalize.cpp -oilPaint.cpp -opacity.cpp -raise.cpp -reduceNoise.cpp -sample.cpp -shade.cpp -sharpen.cpp -solarize.cpp -spread.cpp -swirl.cpp -threshold.cpp -unsharpmask.cpp -wave.cpp +set(extension_internal_bitmap_SRC + adaptiveThreshold.cpp + addNoise.cpp + blur.cpp + channel.cpp + charcoal.cpp + colorize.cpp + contrast.cpp + cycleColormap.cpp + despeckle.cpp + edge.cpp + emboss.cpp + enhance.cpp + equalize.cpp + gaussianBlur.cpp + imagemagick.cpp + implode.cpp + levelChannel.cpp + level.cpp + medianFilter.cpp + modulate.cpp + negate.cpp + normalize.cpp + oilPaint.cpp + opacity.cpp + raise.cpp + reduceNoise.cpp + sample.cpp + shade.cpp + sharpen.cpp + solarize.cpp + spread.cpp + swirl.cpp + threshold.cpp + unsharpmask.cpp + wave.cpp ) diff --git a/src/extension/internal/filter/CMakeLists.txt b/src/extension/internal/filter/CMakeLists.txt index 80a14ba3a..349504f94 100644 --- a/src/extension/internal/filter/CMakeLists.txt +++ b/src/extension/internal/filter/CMakeLists.txt @@ -1,8 +1,8 @@ -SET(extension_internal_filter_SRC -drop-shadow.h -filter-all.cpp -filter.cpp -filter-file.cpp -filter.h -snow.h +set(extension_internal_filter_SRC + drop-shadow.h + filter-all.cpp + filter.cpp + filter-file.cpp + filter.h + snow.h ) diff --git a/src/extension/internal/pdfinput/CMakeLists.txt b/src/extension/internal/pdfinput/CMakeLists.txt index 9a093a065..fe31c2a7f 100644 --- a/src/extension/internal/pdfinput/CMakeLists.txt +++ b/src/extension/internal/pdfinput/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(extension_internal_pdfinput_SRC -pdf-input.cpp -pdf-parser.cpp -svg-builder.cpp +set(extension_internal_pdfinput_SRC + pdf-input.cpp + pdf-parser.cpp + svg-builder.cpp ) diff --git a/src/extension/param/CMakeLists.txt b/src/extension/param/CMakeLists.txt index 2ef5d5005..b2981308e 100644 --- a/src/extension/param/CMakeLists.txt +++ b/src/extension/param/CMakeLists.txt @@ -1,14 +1,13 @@ -SET(extension_param_SRC -bool.cpp -color.cpp -description.cpp -groupheader.cpp -enum.cpp -parameter.cpp -float.cpp -int.cpp -notebook.cpp -radiobutton.cpp -string.cpp +set(extension_param_SRC + bool.cpp + color.cpp + description.cpp + enum.cpp + float.cpp + int.cpp + notebook.cpp + parameter.cpp + radiobutton.cpp + string.cpp ) diff --git a/src/extension/script/CMakeLists.txt b/src/extension/script/CMakeLists.txt index 693948508..88977164e 100644 --- a/src/extension/script/CMakeLists.txt +++ b/src/extension/script/CMakeLists.txt @@ -1,3 +1,3 @@ -SET(extension_script_SRC -InkscapeScript.cpp +set(extension_script_SRC + InkscapeScript.cpp ) diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt index 554402d35..32819fa68 100644 --- a/src/filters/CMakeLists.txt +++ b/src/filters/CMakeLists.txt @@ -1,25 +1,24 @@ -SET(filters_SRC -blend.cpp -colormatrix.cpp -componenttransfer.cpp -componenttransfer-funcnode.cpp -composite.cpp -convolvematrix.cpp -diffuselighting.cpp -displacementmap.cpp -distantlight.cpp -flood.cpp -image.cpp -merge.cpp -mergenode.cpp -morphology.cpp -offset.cpp -pointlight.cpp -specularlighting.cpp -spotlight.cpp -tile.cpp -turbulence.cpp +set(filters_SRC + blend.cpp + colormatrix.cpp + componenttransfer.cpp + componenttransfer-funcnode.cpp + composite.cpp + convolvematrix.cpp + diffuselighting.cpp + displacementmap.cpp + distantlight.cpp + flood.cpp + image.cpp + merge.cpp + mergenode.cpp + morphology.cpp + offset.cpp + pointlight.cpp + specularlighting.cpp + spotlight.cpp + tile.cpp + turbulence.cpp ) -ADD_LIBRARY(filters STATIC ${filters_SRC}) -TARGET_LINK_LIBRARIES(filters -2geom ${INKSCAPE_LIBS}) +add_library(filters STATIC ${filters_SRC}) +target_link_libraries(filters 2geom ${INKSCAPE_LIBS}) diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 8f42a0d5a..e2ca2336d 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,29 +1,31 @@ include(UseGlibMarshal) GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") -SET(GlibOutput -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h + +set(GlibOutput + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h ) -SET(helper_SRC -action.cpp -geom.cpp -geom-nodetype.cpp -gnome-utils.cpp -pixbuf-ops.cpp -png-write.cpp -stock-items.cpp -unit-menu.cpp -units.cpp -#units-test.cpp -unit-tracker.cpp -window.cpp -sp-marshal.list -# we generate this file and it's .h counter-part -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h +set(helper_SRC + action.cpp + geom.cpp + geom-nodetype.cpp + gnome-utils.cpp + pixbuf-ops.cpp + png-write.cpp + stock-items.cpp + unit-menu.cpp + units.cpp + #units-test.cpp + unit-tracker.cpp + window.cpp + sp-marshal.cpp + sp-marshal.list + # we generate this file and it's .h counter-part + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h ) -ADD_LIBRARY(helper STATIC ${helper_SRC}) -TARGET_LINK_LIBRARIES(helper -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(helper STATIC ${helper_SRC}) +target_link_libraries(helper 2geom ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt index 13b8f568b..b60830042 100644 --- a/src/io/CMakeLists.txt +++ b/src/io/CMakeLists.txt @@ -1,16 +1,15 @@ -SET(io_SRC -base64stream.cpp -ftos.cpp -gzipstream.cpp -inkscapestream.cpp -resource.cpp -simple-sax.cpp -#streamtest.cpp -stringstream.cpp -sys.cpp -uristream.cpp -xsltstream.cpp +set(io_SRC + base64stream.cpp + ftos.cpp + gzipstream.cpp + inkjar.cpp + inkscapestream.cpp + resource.cpp + simple-sax.cpp + stringstream.cpp + sys.cpp + uristream.cpp + xsltstream.cpp ) -ADD_LIBRARY(io STATIC ${io_SRC}) -TARGET_LINK_LIBRARIES(io -2geom ${INKSCAPE_LIBS})
\ No newline at end of file +add_library(io STATIC ${io_SRC}) +target_link_libraries(io 2geom ${INKSCAPE_LIBS}) diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt index 5f4dfa981..6975d06d6 100644 --- a/src/jabber_whiteboard/CMakeLists.txt +++ b/src/jabber_whiteboard/CMakeLists.txt @@ -1,23 +1,23 @@ -ADD_SUBDIRECTORY(dialog) +add_subdirectory(dialog) -SET(jabber_whiteboard_SRC -defines.cpp -empty.cpp -inkboard-document.cpp -inkboard-node.cpp -invitation-confirm-dialog.cpp -keynode.cpp -message-aggregator.cpp -message-queue.cpp -message-tags.cpp -message-utilities.cpp -#node-tracker.cpp -#node-utilities.cpp -pedrogui.cpp -session-file-selector.cpp -session-manager.cpp -${jabber_whiteboard_dialog_SRC} +set(jabber_whiteboard_SRC + defines.cpp + empty.cpp + inkboard-document.cpp + inkboard-node.cpp + invitation-confirm-dialog.cpp + keynode.cpp + message-aggregator.cpp + message-queue.cpp + message-tags.cpp + message-utilities.cpp + #node-tracker.cpp + #node-utilities.cpp + pedrogui.cpp + session-file-selector.cpp + session-manager.cpp + ${jabber_whiteboard_dialog_SRC} ) -ADD_LIBRARY(jabber_whiteboard STATIC ${jabber_whiteboard_SRC}) -TARGET_LINK_LIBRARIES(jabber_whiteboard -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(jabber_whiteboard STATIC ${jabber_whiteboard_SRC}) +target_link_libraries(jabber_whiteboard 2geom ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/jabber_whiteboard/dialog/CMakeLists.txt b/src/jabber_whiteboard/dialog/CMakeLists.txt index 74863aa4b..8272a61e2 100644 --- a/src/jabber_whiteboard/dialog/CMakeLists.txt +++ b/src/jabber_whiteboard/dialog/CMakeLists.txt @@ -1,3 +1,4 @@ -SET(jabber_whiteboard_dialog_SRC -choose-desktop.cpp + +set(jabber_whiteboard_dialog_SRC + choose-desktop.cpp ) diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index 3f408074c..b76cf1d39 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -1,19 +1,18 @@ -SET(libavoid_SRC -connector.cpp -geometry.cpp -graph.cpp -makepath.cpp -polyutil.cpp -region.cpp -router.cpp -shape.cpp -static.cpp -timer.cpp -vertices.cpp -visibility.cpp -orthogonal.cpp -vpsc.cpp +set(libavoid_SRC + connector.cpp + geometry.cpp + geomtypes.cpp + graph.cpp + makepath.cpp + orthogonal.cpp + router.cpp + shape.cpp + timer.cpp + vertices.cpp + viscluster.cpp + visibility.cpp + vpsc.cpp ) -ADD_LIBRARY(avoid STATIC ${libavoid_SRC}) -TARGET_LINK_LIBRARIES(avoid -${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(avoid STATIC ${libavoid_SRC}) +target_link_libraries(avoid ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt index b5f2e7f1f..19ac816b2 100644 --- a/src/libcola/CMakeLists.txt +++ b/src/libcola/CMakeLists.txt @@ -1,12 +1,11 @@ -SET(libcola_SRC -cola.cpp -conjugate_gradient.cpp -connected_components.cpp -cycle_detector.cpp -gradient_projection.cpp -shortest_paths.cpp -straightener.cpp +set(libcola_SRC + cola.cpp + conjugate_gradient.cpp + connected_components.cpp + cycle_detector.cpp + gradient_projection.cpp + shortest_paths.cpp + straightener.cpp ) -ADD_LIBRARY(cola STATIC ${libcola_SRC}) -TARGET_LINK_LIBRARIES(cola -${INKSCAPE_LIBS})
\ No newline at end of file +add_library(cola STATIC ${libcola_SRC}) +target_link_libraries(cola ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt index 3ca55b4b5..7e8aa9176 100644 --- a/src/libcroco/CMakeLists.txt +++ b/src/libcroco/CMakeLists.txt @@ -1,32 +1,33 @@ -SET(libcroco_SRC -cr-additional-sel.c -cr-attr-sel.c -cr-cascade.c -cr-declaration.c -cr-doc-handler.c -cr-enc-handler.c -cr-fonts.c -cr-input.c -cr-libxml-node-iface.c -cr-num.c -cr-om-parser.c -cr-parser.c -cr-parsing-location.c -cr-prop-list.c -cr-pseudo.c -cr-rgb.c -cr-selector.c -cr-sel-eng.c -cr-simple-sel.c -cr-statement.c -cr-string.c -cr-style.c -cr-stylesheet.c -cr-term.c -cr-tknzr.c -cr-token.c -cr-utils.c + +set(libcroco_SRC + cr-additional-sel.c + cr-attr-sel.c + cr-cascade.c + cr-declaration.c + cr-doc-handler.c + cr-enc-handler.c + cr-fonts.c + cr-input.c + cr-libxml-node-iface.c + cr-num.c + cr-om-parser.c + cr-parser.c + cr-parsing-location.c + cr-prop-list.c + cr-pseudo.c + cr-rgb.c + cr-selector.c + cr-sel-eng.c + cr-simple-sel.c + cr-statement.c + cr-string.c + cr-style.c + cr-stylesheet.c + cr-term.c + cr-tknzr.c + cr-token.c + cr-utils.c ) -ADD_LIBRARY(croco STATIC ${libcroco_SRC}) -TARGET_LINK_LIBRARIES(croco -${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(croco STATIC ${libcroco_SRC}) +target_link_libraries(croco ${INKSCAPE_LIBS}) diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt index dea93e6bc..f59ec5420 100644 --- a/src/libgdl/CMakeLists.txt +++ b/src/libgdl/CMakeLists.txt @@ -1,28 +1,29 @@ -IF(WIN32) -SET(GDL_WIN -gdl-win32.c -) -ENDIF(WIN32) -SET(libgdl_SRC -gdl-dock.c -gdl-dock-bar.c -gdl-dock-item.c -gdl-dock-item-grip.c -gdl-dock-master.c -gdl-dock-notebook.c -gdl-dock-object.c -gdl-dock-paned.c -gdl-dock-placeholder.c -gdl-dock-tablabel.c -gdl-i18n.c -gdl-stock.c -gdl-switcher.c -gdl-tools.h -libgdlmarshal.c -libgdltypebuiltins.c -${GDL_WIN} +set(libgdl_SRC + gdl-dock.c + gdl-dock-bar.c + gdl-dock-item.c + gdl-dock-item-grip.c + gdl-dock-master.c + gdl-dock-notebook.c + gdl-dock-object.c + gdl-dock-paned.c + gdl-dock-placeholder.c + gdl-dock-tablabel.c + gdl-i18n.c + gdl-stock.c + gdl-switcher.c + gdl-tools.h + libgdlmarshal.c + libgdltypebuiltins.c + ${GDL_WIN} ) + +if(WIN32) + list(APPEND libgdl_SRC + gdl-win32.c + ) +endif() + ADD_LIBRARY(gdl STATIC ${libgdl_SRC}) -TARGET_LINK_LIBRARIES(gdl -${INKSCAPE_LIBS})
\ No newline at end of file +TARGET_LINK_LIBRARIES(gdl ${INKSCAPE_LIBS}) diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt index 3bf483181..798eb0d11 100644 --- a/src/libnr/CMakeLists.txt +++ b/src/libnr/CMakeLists.txt @@ -1,36 +1,37 @@ -SET(libnr_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 -nr-values.cpp -testnr.cpp + +set(libnr_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 + nr-values.cpp + #testnr.cpp ) -ADD_LIBRARY(nr STATIC ${libnr_SRC}) -TARGET_LINK_LIBRARIES(nr -2geom ${INKSCAPE_LIBS}) + +add_library(nr STATIC ${libnr_SRC}) +target_link_libraries(nr 2geom ${INKSCAPE_LIBS}) diff --git a/src/libnr/testnr.cpp b/src/libnr/testnr.cpp index 12dce4c52..7ce01afab 100644 --- a/src/libnr/testnr.cpp +++ b/src/libnr/testnr.cpp @@ -9,6 +9,8 @@ * This code is in public domain */ +#include <stdio.h> + #if defined (_WIN32) || defined (__WIN32__) # include <windows.h> #include <glib.h> diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt index 61ecb0091..4402e5066 100644 --- a/src/libnrtype/CMakeLists.txt +++ b/src/libnrtype/CMakeLists.txt @@ -1,19 +1,18 @@ -SET(libnrtype_SRC -FontFactory.cpp -FontInstance.cpp -font-lister.cpp -font-style-to-pos.cpp -Layout-TNG.cpp -Layout-TNG-Compute.cpp -Layout-TNG-Input.cpp -Layout-TNG-OutIter.cpp -Layout-TNG-Output.cpp -Layout-TNG-Scanline-Makers.cpp -nr-type-pos-def.cpp -nr-type-primitives.cpp -RasterFont.cpp -TextWrapper.cpp +set(libnrtype_SRC + FontFactory.cpp + FontInstance.cpp + font-lister.cpp + font-style-to-pos.cpp + Layout-TNG.cpp + Layout-TNG-Compute.cpp + Layout-TNG-Input.cpp + Layout-TNG-OutIter.cpp + Layout-TNG-Output.cpp + Layout-TNG-Scanline-Makers.cpp + nr-type-pos-def.cpp + nr-type-primitives.cpp + RasterFont.cpp + TextWrapper.cpp ) -ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC}) -TARGET_LINK_LIBRARIES(nrtype -nr ${INKSCAPE_LIBS}) +add_library(nrtype STATIC ${libnrtype_SRC}) +target_link_libraries(nrtype nr ${INKSCAPE_LIBS}) diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt index 4c3398b0f..57811ad0a 100644 --- a/src/libvpsc/CMakeLists.txt +++ b/src/libvpsc/CMakeLists.txt @@ -1,13 +1,14 @@ -SET(libvpsc_SRC
-block.cpp
-blocks.cpp
-constraint.cpp
-csolve_VPSC.cpp
-generate-constraints.cpp
-remove_rectangle_overlap.cpp
-solve_VPSC.cpp
-variable.cpp
+set(libvpsc_SRC
+ block.cpp
+ blocks.cpp
+ constraint.cpp
+ csolve_VPSC.cpp
+ generate-constraints.cpp
+ remove_rectangle_overlap.cpp
+ solve_VPSC.cpp
+ variable.cpp
+ pairingheap/PairingHeap.cpp
)
-ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})
-TARGET_LINK_LIBRARIES(vpsc
-${INKSCAPE_LIBS})
\ No newline at end of file +
+add_library(vpsc STATIC ${libvpsc_SRC})
+target_link_libraries(vpsc ${INKSCAPE_LIBS})
diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt index 6eaf84d1c..965926fb8 100644 --- a/src/livarot/CMakeLists.txt +++ b/src/livarot/CMakeLists.txt @@ -1,25 +1,25 @@ -SET(livarot_SRC -AlphaLigne.cpp -AVL.cpp -BitLigne.cpp -float-line.cpp -int-line.cpp -PathConversion.cpp -Path.cpp -PathCutting.cpp -path-description.cpp -PathOutline.cpp -PathSimplify.cpp -PathStroke.cpp -Shape.cpp -ShapeDraw.cpp -ShapeMisc.cpp -ShapeRaster.cpp -ShapeSweep.cpp -sweep-event.cpp -sweep-tree.cpp -sweep-tree-list.cpp +set(livarot_SRC + AlphaLigne.cpp + AVL.cpp + BitLigne.cpp + float-line.cpp + int-line.cpp + PathConversion.cpp + Path.cpp + PathCutting.cpp + path-description.cpp + PathOutline.cpp + PathSimplify.cpp + PathStroke.cpp + Shape.cpp + ShapeDraw.cpp + ShapeMisc.cpp + ShapeRaster.cpp + ShapeSweep.cpp + sweep-event.cpp + sweep-tree.cpp + sweep-tree-list.cpp ) -ADD_LIBRARY(livarot STATIC ${livarot_SRC}) -TARGET_LINK_LIBRARIES(nrtype -${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(livarot STATIC ${livarot_SRC}) +target_link_libraries(nrtype ${INKSCAPE_LIBS}) diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index 70e8cbaf8..42f8208ec 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -1,37 +1,48 @@ -ADD_SUBDIRECTORY(parameter) +add_subdirectory(parameter) -SET(live_effects_SRC -bezctx.cpp -effect.cpp -lpe-bendpath.cpp -lpe-boolops.cpp -lpe-circle_with_radius.cpp -lpe-constructgrid.cpp -lpe-curvestitch.cpp -lpe-envelope.cpp -lpe-gears.cpp -lpegroupbbox.cpp -lpe-interpolate.cpp -lpe-knot.cpp -lpe-rough-hatches.cpp -lpe-lattice.cpp -lpe-mirror_symmetry.cpp -lpeobject.cpp -lpeobject-reference.cpp -lpe-patternalongpath.cpp -lpe-perp_bisector.cpp -lpe-perspective_path.cpp -lpe-powerstroke.cpp -lpe-skeleton.cpp -lpe-sketch.cpp -lpe-spiro.cpp -lpe-tangent_to_curve.cpp -lpe-test-doEffect-stack.cpp -lpe-vonkoch.cpp -lpe-dynastroke.cpp -spiro.cpp -${live_effects_parameter_SRC} +set(live_effects_SRC + bezctx.cpp + effect.cpp + lpe-angle_bisector.cpp + lpe-bendpath.cpp + lpe-boolops.cpp + lpe-circle_3pts.cpp + lpe-circle_with_radius.cpp + lpe-constructgrid.cpp + lpe-copy_rotate.cpp + lpe-curvestitch.cpp + lpe-dynastroke.cpp + lpe-envelope.cpp + lpe-extrude.cpp + lpe-gears.cpp + lpe-interpolate.cpp + lpe-knot.cpp + lpe-lattice.cpp + lpe-line_segment.cpp + lpe-mirror_symmetry.cpp + lpe-offset.cpp + lpe-parallel.cpp + lpe-path_length.cpp + lpe-patternalongpath.cpp + lpe-perp_bisector.cpp + lpe-perspective_path.cpp + lpe-powerstroke.cpp + lpe-recursiveskeleton.cpp + lpe-rough-hatches.cpp + lpe-ruler.cpp + lpe-skeleton.cpp + lpe-sketch.cpp + lpe-spiro.cpp + lpe-tangent_to_curve.cpp + lpe-test-doEffect-stack.cpp + lpe-text_label.cpp + lpe-vonkoch.cpp + lpegroupbbox.cpp + lpeobject-reference.cpp + lpeobject.cpp + spiro.cpp + ${live_effects_parameter_SRC} ) -ADD_LIBRARY(live_effects STATIC ${live_effects_SRC}) -TARGET_LINK_LIBRARIES(live_effects -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(live_effects STATIC ${live_effects_SRC}) +target_link_libraries(live_effects 2geom ${INKSCAPE_LIBS}) diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt index 8657b2bec..04a1080f4 100644 --- a/src/live_effects/parameter/CMakeLists.txt +++ b/src/live_effects/parameter/CMakeLists.txt @@ -1,13 +1,13 @@ -SET(live_effects_parameter_SRC -array.cpp -bool.cpp -parameter.cpp -path.cpp -path-reference.cpp -point.cpp -powerstrokepointarray.cpp -random.cpp -text.cpp -unit.cpp -vector.cpp +set(live_effects_parameter_SRC + array.cpp + bool.cpp + parameter.cpp + path.cpp + path-reference.cpp + point.cpp + powerstrokepointarray.cpp + random.cpp + text.cpp + unit.cpp + vector.cpp ) diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt index cb9a01b2f..5595d755e 100644 --- a/src/pedro/CMakeLists.txt +++ b/src/pedro/CMakeLists.txt @@ -1,13 +1,12 @@ -SET(pedro_SRC -#empty.cpp -#geckoembed.cpp -pedroconfig.cpp -pedrodom.cpp -#pedrogui.cpp -#pedromain.cpp -pedroutil.cpp -pedroxmpp.cpp +set(pedro_SRC + #empty.cpp + #geckoembed.cpp + pedroconfig.cpp + pedrodom.cpp + #pedrogui.cpp + #pedromain.cpp + pedroutil.cpp + pedroxmpp.cpp ) -ADD_LIBRARY(pedro STATIC ${pedro_SRC}) -TARGET_LINK_LIBRARIES(pedro -${INKSCAPE_LIBS})
\ No newline at end of file +add_library(pedro STATIC ${pedro_SRC}) +target_link_libraries(pedro ${INKSCAPE_LIBS})
\ No newline at end of file diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index 9d5dc0b7b..b2c4b918e 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -1,18 +1,18 @@ -SET(svg_SRC -css-ostringstream.cpp -#ftos.cpp -itos.cpp -path-string.cpp -round.cpp -sp-svg.def -stringstream.cpp -strip-trailing-zeros.cpp -svg-affine.cpp -svg-color.cpp -svg-length.cpp -svg-path.cpp -#test-stubs.cpp +set(svg_SRC + css-ostringstream.cpp + #ftos.cpp + itos.cpp + path-string.cpp + round.cpp + sp-svg.def + stringstream.cpp + strip-trailing-zeros.cpp + svg-affine.cpp + svg-color.cpp + svg-length.cpp + svg-path.cpp + #test-stubs.cpp ) -ADD_LIBRARY(svg STATIC ${svg_SRC}) -TARGET_LINK_LIBRARIES(svg -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(svg STATIC ${svg_SRC}) +target_link_libraries(svg 2geom ${INKSCAPE_LIBS}) diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt index 3cb378995..312ee209c 100644 --- a/src/trace/CMakeLists.txt +++ b/src/trace/CMakeLists.txt @@ -1,12 +1,12 @@ -ADD_SUBDIRECTORY(potrace) -SET(trace_SRC -filterset.cpp -imagemap.cpp -imagemap-gdk.cpp -quantize.cpp -siox.cpp -trace.cpp -${trace_potrace_SRC} +add_subdirectory(potrace) +set(trace_SRC + filterset.cpp + imagemap.cpp + imagemap-gdk.cpp + quantize.cpp + siox.cpp + trace.cpp + ${trace_potrace_SRC} ) ADD_LIBRARY(trace STATIC ${trace_SRC}) TARGET_LINK_LIBRARIES(trace diff --git a/src/trace/potrace/CMakeLists.txt b/src/trace/potrace/CMakeLists.txt index f61e8bcd1..e48d7689f 100644 --- a/src/trace/potrace/CMakeLists.txt +++ b/src/trace/potrace/CMakeLists.txt @@ -1,9 +1,9 @@ -SET(trace_potrace_SRC -curve.cpp -decompose.cpp -greymap.cpp -inkscape-potrace.cpp -potracelib.cpp -render.cpp -trace.cpp +set(trace_potrace_SRC + curve.cpp + decompose.cpp + greymap.cpp + inkscape-potrace.cpp + potracelib.cpp + render.cpp + trace.cpp ) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 01dadb7c2..28dcd1ded 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,24 +1,46 @@ -SET(uifolders -cache -dialog -view -widget +set(uifolders + cache + dialog + view + widget ) -FOREACH(uilistsrc ${uifolders}) - ADD_SUBDIRECTORY(${uilistsrc}) -ENDFOREACH(uilistsrc) +foreach(uilistsrc ${uifolders}) + add_subdirectory(${uilistsrc}) +endforeach() -SET(ui_SRC -clipboard.cpp -context-menu.cpp -previewholder.cpp -stock.cpp -stock-items.cpp -${ui_cache_SRC} -${ui_dialog_SRC} -${ui_view_SRC} -${ui_widget_SRC} +set(ui_SRC + clipboard.cpp + context-menu.cpp + previewholder.cpp + uxmanager.cpp + + tool/control-point-selection.cpp + tool/control-point.cpp + tool/curve-drag-point.cpp + tool/event-utils.cpp + tool/manipulator.cpp + tool/modifier-tracker.cpp + tool/multi-path-manipulator.cpp + tool/node-tool.cpp + tool/node.cpp + tool/path-manipulator.cpp + tool/selectable-control-point.cpp + tool/selector.cpp + tool/transform-handle-set.cpp + + ${ui_cache_SRC} + ${ui_dialog_SRC} + ${ui_view_SRC} + ${ui_widget_SRC} +) + +include_directories( + "${CMAKE_SOURCE_DIR}/src" + "${CMAKE_SOURCE_DIR}" + "${CMAKE_SOURCE_DIR}/bind/javainc" + "${CMAKE_SOURCE_DIR}/bind/javainc/linux" + "${CMAKE_SOURCE_DIR}/extension/dbus" ) -ADD_LIBRARY(ui STATIC ${ui_SRC}) -TARGET_LINK_LIBRARIES(ui -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(ui STATIC ${ui_SRC}) +target_link_libraries(ui 2geom ${INKSCAPE_LIBS}) diff --git a/src/ui/cache/CMakeLists.txt b/src/ui/cache/CMakeLists.txt index a78010196..c00410de5 100644 --- a/src/ui/cache/CMakeLists.txt +++ b/src/ui/cache/CMakeLists.txt @@ -1,3 +1,3 @@ -SET(ui_cache_SRC -svg_preview_cache.cpp +set(ui_cache_SRC + svg_preview_cache.cpp ) diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt index 98c4a47bb..dbd34cec1 100644 --- a/src/ui/dialog/CMakeLists.txt +++ b/src/ui/dialog/CMakeLists.txt @@ -1,45 +1,52 @@ -IF(WIN32) -SET(ui_dialog_WIN32_SRC -filedialogimpl-win32.cpp -) -ELSEIF(WIN32) - SET(ui_dialog_WIN32_SRC) -ENDIF(WIN32) -SET(ui_dialog_SRC -aboutbox.cpp -align-and-distribute.cpp -color-item.cpp -debug.cpp -dialog.cpp -dialog-manager.cpp -dock-behavior.cpp -document-metadata.cpp -document-properties.cpp -extension-editor.cpp -eek-preview.cpp -ege-paint-def.cpp -filedialog.cpp -filedialogimpl-gtkmm.cpp -fill-and-stroke.cpp -filter-effects-dialog.cpp -find.cpp -floating-behavior.cpp -inkscape-preferences.cpp -input.cpp -livepatheffect-editor.cpp -memory.cpp -messages.cpp -ocaldialogs.cpp -print.cpp -scriptdialog.cpp -#session-player.cpp -tile.cpp -tracedialog.cpp -transformation.cpp -undo-history.cpp -#whiteboard-connect.cpp -#whiteboard-sharewithchat.cpp -#whiteboard-sharewithuser.cpp -${ui_dialog_WIN32_SRC} +set(ui_dialog_SRC + aboutbox.cpp + align-and-distribute.cpp + calligraphic-profile-rename.cpp + color-item.cpp + debug.cpp + desktop-tracker.cpp + dialog-manager.cpp + dialog.cpp + dock-behavior.cpp + document-metadata.cpp + document-properties.cpp + extension-editor.cpp + extensions.cpp + filedialog.cpp + filedialogimpl-gtkmm.cpp + fill-and-stroke.cpp + filter-effects-dialog.cpp + find.cpp + floating-behavior.cpp + glyphs.cpp + guides.cpp + icon-preview.cpp + inkscape-preferences.cpp + input.cpp + layer-properties.cpp + layers.cpp + livepatheffect-editor.cpp + memory.cpp + messages.cpp + ocaldialogs.cpp + print-colors-preview-dialog.cpp + print.cpp + scriptdialog.cpp + session-player.cpp + svg-fonts-dialog.cpp + swatches.cpp + tile.cpp + tracedialog.cpp + transformation.cpp + undo-history.cpp + whiteboard-connect.cpp + whiteboard-sharewithchat.cpp + whiteboard-sharewithuser.cpp ) + +if(WIN32) + list(APPEND ui_dialog_SRC + filedialogimpl-win32.cpp + ) +endif() diff --git a/src/ui/view/CMakeLists.txt b/src/ui/view/CMakeLists.txt index 5c96bc40e..c0914d887 100644 --- a/src/ui/view/CMakeLists.txt +++ b/src/ui/view/CMakeLists.txt @@ -1,10 +1,4 @@ -SET(ui_view_SRC -desktop.cpp -desktop-events.cpp -desktop-handles.cpp -desktop-style.cpp -edit.cpp -edit-widget.cpp -view.cpp -view-widget.cpp +set(ui_view_SRC + view.cpp + view-widget.cpp ) diff --git a/src/ui/widget/CMakeLists.txt b/src/ui/widget/CMakeLists.txt index ffc94c299..c81ea5e24 100644 --- a/src/ui/widget/CMakeLists.txt +++ b/src/ui/widget/CMakeLists.txt @@ -1,40 +1,43 @@ -SET(ui_widget_SRC -button.cpp -color-picker.cpp -color-preview.cpp -combo-text.cpp -dock.cpp -dock-item.cpp -entity-entry.cpp -entry.cpp -filter-effect-chooser.cpp -handlebox.cpp -icon-widget.cpp -imageicon.cpp -imagetoggler.cpp -labelled.cpp -licensor.cpp -notebook-page.cpp -object-composite-settings.cpp -page-sizer.cpp -panel.cpp -point.cpp -preferences-widget.cpp -random.cpp -registered-widget.cpp -registry.cpp -rendering-options.cpp -rotateable.cpp -ruler.cpp -scalar.cpp -scalar-unit.cpp -selected-style.cpp -spin-slider.cpp -style-subject.cpp -style-swatch.cpp -svg-canvas.cpp -tolerance-slider.cpp -toolbox.cpp -unit-menu.cpp -zoom-status.cpp +set(ui_widget_SRC + button.cpp + color-picker.cpp + color-preview.cpp + combo-text.cpp + dock-item.cpp + dock.cpp + entity-entry.cpp + entry.cpp + filter-effect-chooser.cpp + handlebox.cpp + icon-widget.cpp + imageicon.cpp + imagetoggler.cpp + labelled.cpp + layer-selector.cpp + licensor.cpp + notebook-page.cpp + object-composite-settings.cpp + page-sizer.cpp + panel.cpp + point.cpp + preferences-widget.cpp + random.cpp + registered-widget.cpp + registry.cpp + rendering-options.cpp + rotateable.cpp + ruler.cpp + scalar-unit.cpp + scalar.cpp + selected-style.cpp + spin-slider.cpp + spinbutton.cpp + style-subject.cpp + style-swatch.cpp + svg-canvas.cpp + text.cpp + tolerance-slider.cpp + toolbox.cpp + unit-menu.cpp + zoom-status.cpp ) diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 18237ac75..936a5fae9 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -1,7 +1,11 @@ -SET(util_SRC -share.cpp -units.cpp + +set(util_SRC + ege-appear-time-tracker.cpp + ege-tags.cpp + expression-evaluator.cpp + share.cpp + units.cpp ) -ADD_LIBRARY(util STATIC ${util_SRC}) -TARGET_LINK_LIBRARIES(util -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(util STATIC ${util_SRC}) +target_link_libraries(util 2geom ${INKSCAPE_LIBS}) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index f3c0e70fa..b698ced98 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,36 +1,40 @@ -SET(widgets_SRC -button.cpp -calligraphic-profile-rename.cpp -dash-selector.cpp -desktop-widget.cpp -font-selector.cpp -gradient-image.cpp -gradient-selector.cpp -gradient-toolbar.cpp -gradient-vector.cpp -icon.cpp -layer-selector.cpp -paint-selector.cpp -ruler.cpp -select-toolbar.cpp -shrink-wrap-button.cpp -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 -sp-color-wheel-selector.cpp -spinbutton-events.cpp -sp-widget.cpp -spw-utilities.cpp -sp-xmlview-attr-list.cpp -sp-xmlview-content.cpp -sp-xmlview-tree.cpp -swatch-selector.cpp -toolbox.cpp + +set(widgets_SRC + button.cpp + dash-selector.cpp + desktop-widget.cpp + eek-preview.cpp + ege-paint-def.cpp + fill-style.cpp + font-selector.cpp + gradient-image.cpp + gradient-selector.cpp + gradient-toolbar.cpp + gradient-vector.cpp + icon.cpp + paint-selector.cpp + ruler.cpp + select-toolbar.cpp + shrink-wrap-button.cpp + sp-attribute-widget.cpp + 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 + sp-color-wheel-selector.cpp + sp-widget.cpp + sp-xmlview-attr-list.cpp + sp-xmlview-content.cpp + sp-xmlview-tree.cpp + spinbutton-events.cpp + spw-utilities.cpp + stroke-style.cpp + swatch-selector.cpp + toolbox.cpp ) -ADD_LIBRARY(widgets STATIC ${widgets_SRC}) -TARGET_LINK_LIBRARIES(widgets -2geom ${INKSCAPE_LIBS}) + +add_library(widgets STATIC ${widgets_SRC}) +target_link_libraries(widgets 2geom ${INKSCAPE_LIBS}) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 775a4e72f..b92d82489 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -1,21 +1,21 @@ -SET(xml_SRC -composite-node-observer.cpp -croco-node-iface.cpp -event.cpp -log-builder.cpp -node-fns.cpp -quote.cpp -#quote-test.cpp -repr.cpp -#repr-action-test.cpp -repr-css.cpp -repr-io.cpp -repr-sorting.cpp -repr-util.cpp -simple-document.cpp -simple-node.cpp -subtree.cpp +set(xml_SRC + composite-node-observer.cpp + croco-node-iface.cpp + event.cpp + log-builder.cpp + node-fns.cpp + quote.cpp + repr.cpp + repr-css.cpp + repr-io.cpp + repr-sorting.cpp + repr-util.cpp + simple-document.cpp + simple-node.cpp + subtree.cpp + helper-observer.cpp + rebase-hrefs.cpp ) -ADD_LIBRARY(xml STATIC ${xml_SRC}) -TARGET_LINK_LIBRARIES(xml -2geom ${INKSCAPE_LIBS})
\ No newline at end of file + +add_library(xml STATIC ${xml_SRC}) +target_link_libraries(xml 2geom ${INKSCAPE_LIBS})
\ No newline at end of file |