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)

5 files changed, 140 insertions, 114 deletions

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
 )