fix for building with cmake and building without lcms works again.

(bzr r10459)

3 files changed, 10 insertions, 15 deletions

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index bc3f64bdc..dc261b5bd 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -27,6 +27,7 @@ set(2geom_SRC
 	point.cpp
 	poly.cpp
 	quadtree.cpp
+	rect.cpp
 	# recursive-bezier-intersection.cpp
 	region.cpp
 	sbasis-2d.cpp
@@ -43,6 +44,7 @@ set(2geom_SRC
 	svg-path-parser.cpp
 	svg-path.cpp
 	sweep.cpp
+	toposweep.cpp
 	transforms.cpp
 	utils.cpp
 
@@ -76,10 +78,14 @@ set(2geom_SRC
 	elliptical-arc.h
 	exception.h
 	forward.h
+	generic-interval.h
+	generic-rect.h
 	geom.h
 	hvlinesegment.h
+	int-interval.h
+	int-point.h
+	int-rect.h
 	interval.h
-	isnan.h
 	line.h
 	linear.h
 	math-utils.h
@@ -89,7 +95,6 @@ set(2geom_SRC
 	path.h
 	pathvector.h
 	piecewise.h
-	point-l.h
 	point-ops.h
 	point.h
 	poly.h
@@ -106,11 +111,11 @@ set(2geom_SRC
 	sbasis.h
 	shape.h
 	solver.h
-	sturm.h
 	svg-elliptical-arc.h
 	svg-path-parser.h
 	svg-path.h
 	sweep.h
+	toposweep.h
 	transforms.h
 	utils.h
 
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index d7f34969f..71f608118 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1120,9 +1120,9 @@ sp_canvas_destroy (GtkObject *object)
     }
 
     shutdown_transients (canvas);
-
+#if ENABLE_LCMS
     canvas->cms_key.~ustring();
-
+#endif
     if (GTK_OBJECT_CLASS (canvas_parent_class)->destroy)
         (* GTK_OBJECT_CLASS (canvas_parent_class)->destroy) (object);
 }
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index b83358ae0..8a31e20db 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -8,7 +8,6 @@ set(nr_SRC
 	nr-rect-l.cpp
 	# nr-rotate-fns-test.cpp
 	#nr-translate-test.cpp
-	nr-types.cpp
 	# nr-types-test.cpp
 	nr-values.cpp
 	# testnr.cpp
@@ -19,24 +18,15 @@ set(nr_SRC
 	# in-svg-plane-test.h
 	in-svg-plane.h
 	nr-convert2geom.h
-	nr-coord.h
-	nr-dim2.h
 	nr-forward.h
-	nr-i-coord.h
 	nr-macros.h
 	nr-object.h
 	# nr-point-fns-test.h
 	nr-point-fns.h
-	nr-point-l.h
-	nr-point-ops.h
-	nr-point.h
 	nr-rect-l.h
-	nr-rect-ops.h
 	nr-rect.h
-	nr-render.h
 	# nr-translate-test.h
 	# nr-types-test.h
-	nr-types.h
 	nr-values.h
 )