cmake:

 turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset.

Fixing this broke the build because some files in the subdir were not compiling.

(bzr r10276)

5 files changed, 98 insertions, 118 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 5fa882f1a..7c0f18a65 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,12 +1,3 @@
-set(uifolders
-	cache
-	dialog
-	view
-	widget
-)
-foreach(uilistsrc ${uifolders})
-	add_subdirectory(${uilistsrc})
-endforeach()
 
 set(ui_SRC
 	clipboard.cpp
@@ -14,6 +5,8 @@ set(ui_SRC
 	previewholder.cpp
 	uxmanager.cpp
 
+	cache/svg_preview_cache.cpp
+
 	tool/control-point-selection.cpp
 	tool/control-point.cpp
 	tool/curve-drag-point.cpp
@@ -27,13 +20,103 @@ set(ui_SRC
 	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}
+
+	dialog/aboutbox.cpp
+	dialog/align-and-distribute.cpp
+	dialog/calligraphic-profile-rename.cpp
+	dialog/color-item.cpp
+	dialog/debug.cpp
+	dialog/desktop-tracker.cpp
+	dialog/dialog-manager.cpp
+	dialog/dialog.cpp
+	dialog/dock-behavior.cpp
+	dialog/document-metadata.cpp
+	dialog/document-properties.cpp
+	dialog/extension-editor.cpp
+	dialog/extensions.cpp
+	dialog/filedialog.cpp
+	dialog/filedialogimpl-gtkmm.cpp
+	dialog/fill-and-stroke.cpp
+	dialog/filter-effects-dialog.cpp
+	dialog/find.cpp
+	dialog/floating-behavior.cpp
+	dialog/glyphs.cpp
+	dialog/guides.cpp
+	dialog/icon-preview.cpp
+	dialog/inkscape-preferences.cpp
+	dialog/input.cpp
+	dialog/layer-properties.cpp
+	dialog/layers.cpp
+	dialog/livepatheffect-editor.cpp
+	dialog/memory.cpp
+	dialog/messages.cpp
+	dialog/ocaldialogs.cpp
+	dialog/print-colors-preview-dialog.cpp
+	dialog/print.cpp
+	dialog/scriptdialog.cpp
+	# dialog/session-player.cpp
+	dialog/svg-fonts-dialog.cpp
+	dialog/swatches.cpp
+	dialog/tile.cpp
+	dialog/tracedialog.cpp
+	dialog/transformation.cpp
+	dialog/undo-history.cpp
+	# dialog/whiteboard-connect.cpp
+	# dialog/whiteboard-sharewithchat.cpp
+	# dialog/whiteboard-sharewithuser.cpp
+
+	widget/button.cpp
+	widget/color-picker.cpp
+	widget/color-preview.cpp
+	widget/combo-text.cpp
+	widget/dock-item.cpp
+	widget/dock.cpp
+	widget/entity-entry.cpp
+	widget/entry.cpp
+	widget/filter-effect-chooser.cpp
+	widget/handlebox.cpp
+	widget/icon-widget.cpp
+	widget/imageicon.cpp
+	widget/imagetoggler.cpp
+	widget/labelled.cpp
+	widget/layer-selector.cpp
+	widget/licensor.cpp
+	widget/notebook-page.cpp
+	widget/object-composite-settings.cpp
+	widget/page-sizer.cpp
+	widget/panel.cpp
+	widget/point.cpp
+	widget/preferences-widget.cpp
+	widget/random.cpp
+	widget/registered-widget.cpp
+	widget/registry.cpp
+	widget/rendering-options.cpp
+	widget/rotateable.cpp
+	widget/ruler.cpp
+	widget/scalar-unit.cpp
+	widget/scalar.cpp
+	widget/selected-style.cpp
+	widget/spin-slider.cpp
+	widget/spinbutton.cpp
+	widget/style-subject.cpp
+	widget/style-swatch.cpp
+	widget/svg-canvas.cpp
+	widget/text.cpp
+	widget/tolerance-slider.cpp
+	widget/toolbox.cpp
+	widget/unit-menu.cpp
+	widget/zoom-status.cpp
+
+	view/view.cpp
+	view/view-widget.cpp
 )
 
+if(WIN32)
+	list(APPEND ui_SRC
+		dialog/filedialogimpl-win32.cpp
+	)
+endif()
+
 include_directories(
 	"${CMAKE_SOURCE_DIR}/src"
 	"${CMAKE_SOURCE_DIR}"
@@ -42,5 +125,4 @@ include_directories(
 	"${CMAKE_SOURCE_DIR}/extension/dbus"
 )
 
-add_library(ui_LIB STATIC ${ui_SRC})
-target_link_libraries(ui_LIB 2geom_LIB ${INKSCAPE_LIBS})
+add_library(ui_LIB ${ui_SRC})
diff --git a/src/ui/cache/CMakeLists.txt b/src/ui/cache/CMakeLists.txt
deleted file mode 100644
index c00410de5..000000000
--- a/src/ui/cache/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ui_cache_SRC
-	svg_preview_cache.cpp
-)
diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt
deleted file mode 100644
index 5f2b31989..000000000
--- a/src/ui/dialog/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-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
deleted file mode 100644
index c0914d887..000000000
--- a/src/ui/view/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-set(ui_view_SRC
-	view.cpp
-	view-widget.cpp
-)
diff --git a/src/ui/widget/CMakeLists.txt b/src/ui/widget/CMakeLists.txt
deleted file mode 100644
index c81ea5e24..000000000
--- a/src/ui/widget/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-)