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)

1 files changed, 331 insertions, 247 deletions

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