updates for cmake

(bzr r12547)

6 files changed, 29 insertions, 28 deletions

diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py
index 4850eb259..3ee6d4449 100644
--- a/CMakeScripts/cmake_consistency_check_config.py
+++ b/CMakeScripts/cmake_consistency_check_config.py
@@ -30,7 +30,6 @@ IGNORE = (
     "src/libnr/nr-compose-reference.cpp",
     "src/libnr/testnr.cp",
     "src/live_effects/lpe-skeleton.cpp",
-    "src/sp-skeleton.cpp",
     "src/svg/test-stubs.cpp",
     "src/ui/dialog/session-player.cpp",
     "src/ui/dialog/whiteboard-connect.cpp",
@@ -41,15 +40,13 @@ IGNORE = (
     # header files
     "share/filters/filters.svg.h",
     "share/palettes/palettes.h",
-    "src/inkscape/share/palettes/palettes.h",
-    "src/inkscape/share/patterns/patterns.svg.h",
-    "src/inkscape/src/libcola/cycle_detector.h",
-    "src/inkscape/src/libnr/in-svg-plane-test.h",
-    "src/inkscape/src/libnr/nr-point-fns-test.h",
-    "src/inkscape/src/libnr/nr-translate-test.h",
-    "src/inkscape/src/libnr/nr-types-test.h",
-    "src/inkscape/src/sp-skeleton.h",
-    "src/inkscape/src/svg/test-stubs.h",
+    "share/palettes/palettes.h",
+    "share/patterns/patterns.svg.h",
+    "src/libcola/cycle_detector.h",
+    "src/libnr/in-svg-plane-test.h",
+    "src/libnr/nr-point-fns-test.h",
+    "src/libnr/nr-translate-test.h",
+    "src/svg/test-stubs.h",
     
     # generated files, created by an in-source build
     "CMakeFiles/CompilerIdC/CMakeCCompilerId.c",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a09bceb06..67c5be11a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,16 +40,17 @@ set(sp_SRC
 	sp-item-update-cns.cpp
 	sp-item.cpp
 	sp-line.cpp
+	sp-linear-gradient.cpp
 	sp-lpe-item.cpp
 	sp-mask.cpp
 	sp-mesh-array.cpp
+	sp-mesh-gradient.cpp
 	sp-mesh-patch.cpp
 	sp-mesh-row.cpp
 	sp-metadata.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
@@ -57,6 +58,7 @@ set(sp_SRC
 	sp-pattern.cpp
 	sp-polygon.cpp
 	sp-polyline.cpp
+	sp-radial-gradient.cpp
 	sp-rect.cpp
 	sp-root.cpp
 	sp-script.cpp
@@ -92,6 +94,7 @@ set(sp_SRC
 	sp-defs.h
 	sp-desc.h
 	sp-ellipse.h
+	sp-factory.h
 	sp-filter-primitive.h
 	sp-filter-reference.h
 	sp-filter-units.h
@@ -103,7 +106,6 @@ set(sp_SRC
 	sp-font.h
 	sp-glyph-kerning.h
 	sp-glyph.h
-	sp-gradient-fns.h
 	sp-gradient-reference.h
 	sp-gradient-spread.h
 	sp-gradient-test.h
@@ -121,23 +123,18 @@ set(sp_SRC
 	sp-item-update-cns.h
 	sp-item.h
 	sp-line.h
-	sp-linear-gradient-fns.h
 	sp-linear-gradient.h
 	sp-lpe-item.h
 	sp-marker-loc.h
 	sp-mask.h
 	sp-mesh-array.h
-	sp-mesh-gradient-fns.h
 	sp-mesh-gradient.h
-	sp-mesh-patch-fns.h
 	sp-mesh-patch.h
-	sp-mesh-row-fns.h
 	sp-mesh-row.h
 	sp-metadata.h
 	sp-missing-glyph.h
 	sp-namedview.h
 	sp-object-group.h
-	sp-object-repr.h
 	sp-object.h
 	sp-offset.h
 	sp-paint-server-reference.h
@@ -146,7 +143,6 @@ set(sp_SRC
 	sp-pattern.h
 	sp-polygon.h
 	sp-polyline.h
-	sp-radial-gradient-fns.h
 	sp-radial-gradient.h
 	sp-rect.h
 	sp-root.h
@@ -357,6 +353,7 @@ set(inkscape_SRC
 	event.h
 	extract-uri-test.h
 	extract-uri.h
+	factory.h
 	file.h
 	fill-or-stroke.h
 	filter-chemistry.h
@@ -393,7 +390,7 @@ set(inkscape_SRC
 	knotholder.h
 	layer-fns.h
 	layer-manager.h
-  layer-model.h
+	layer-model.h
 	line-geometry.h
 	line-snapper.h
 	lpe-tool-context.h
@@ -474,6 +471,7 @@ set(inkscape_SRC
 	text-context.h
 	text-editing.h
 	text-tag-attributes.h
+	tool-factory.h
 	tools-switch.h
 	transf_mat_3x4.h
 	tweak-context.h
@@ -490,7 +488,7 @@ set(inkscape_SRC
 )
 
 if(WIN32)
-    list(APPEND inkscape_SRC
+	list(APPEND inkscape_SRC
 		registrytool.cpp
 		#deptool.cpp
 		winmain.cpp
@@ -597,6 +595,7 @@ target_link_libraries(inkscape
 	livarot_LIB
 	uemf_LIB
 	2geom_LIB
+	depixelize_LIB
 
 	${INKSCAPE_LIBS}
 )
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 8f8355c03..ef577b014 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -2,7 +2,6 @@
 set(io_SRC
 	base64stream.cpp
 	bufferstream.cpp
-	ftos.cpp
 	gzipstream.cpp
 	inkjar.cpp
 	inkscapestream.cpp
@@ -16,7 +15,6 @@ set(io_SRC
 	# Headers
 	base64stream.h
 	bufferstream.h
-	ftos.h
 	gzipstream.h
 	inkjar.h
 	inkscapestream.h
diff --git a/src/libdepixelize/CMakeLists.txt b/src/libdepixelize/CMakeLists.txt
index 64a72f9d9..e05849e29 100644
--- a/src/libdepixelize/CMakeLists.txt
+++ b/src/libdepixelize/CMakeLists.txt
@@ -4,8 +4,17 @@ set(libdepixelize_SRC
 
 	# -------
 	# Headers
-        kopftracer2011.h
-        splines.h
+	kopftracer2011.h
+	splines.h
+
+	priv/branchless.h
+	priv/colorspace.h
+	priv/homogeneoussplines.h
+	priv/iterator.h
+	priv/pixelgraph.h
+	priv/point.h
+	priv/simplifiedvoronoi.h
+	priv/splines.h
 )
 
 add_inkscape_lib(depixelize_LIB "${libdepixelize_SRC}")
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 943c3088f..968287895 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,10 +1,7 @@
 
 set(svg_SRC
 	css-ostringstream.cpp
-	#ftos.cpp
-	itos.cpp
 	path-string.cpp
-	round.cpp
 	sp-svg.def
 	stringstream.cpp
 	strip-trailing-zeros.cpp
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 233e01862..24324c874 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -175,6 +175,7 @@ set(ui_SRC
 	dialog/object-properties.h
 	dialog/ocaldialogs.h
 	dialog/panel-dialog.h
+	dialog/pixelartdialog.h
 	dialog/print-colors-preview-dialog.h
 	dialog/print.h
 	
@@ -183,7 +184,7 @@ set(ui_SRC
 	dialog/swatches.h
 	dialog/symbols.h
 	dialog/template-load-tab.h
-    dialog/template-widget.h
+	dialog/template-widget.h
 	dialog/text-edit.h
 	dialog/tile.h
 	dialog/tracedialog.h