Merge from trunk

(bzr r9508.1.89)

1 files changed, 35 insertions, 17 deletions

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 9d5dc0b7b..9a721969a 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -1,18 +1,36 @@
-SET(svg_SRC
-css-ostringstream.cpp
-#ftos.cpp
-itos.cpp
-path-string.cpp
-round.cpp
-sp-svg.def
-stringstream.cpp
-strip-trailing-zeros.cpp
-svg-affine.cpp
-svg-color.cpp
-svg-length.cpp
-svg-path.cpp
-#test-stubs.cpp
+
+set(svg_SRC
+	css-ostringstream.cpp
+	#ftos.cpp
+	itos.cpp
+	path-string.cpp
+	round.cpp
+	sp-svg.def
+	stringstream.cpp
+	strip-trailing-zeros.cpp
+	svg-affine.cpp
+	svg-color.cpp
+	svg-length.cpp
+	svg-path.cpp
+	# test-stubs.cpp
+
+	css-ostringstream-test.h
+	css-ostringstream.h
+	path-string.h
+	stringstream-test.h
+	stringstream.h
+	strip-trailing-zeros.h
+	svg-affine-test.h
+	svg-color-test.h
+	svg-color.h
+	svg-icc-color.h
+	svg-length-test.h
+	svg-length.h
+	svg-path-geom-test.h
+	svg.h
+	# test-stubs.h
+
 )
-ADD_LIBRARY(svg STATIC ${svg_SRC})
-TARGET_LINK_LIBRARIES(svg
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+
+# add_inkscape_lib(svg_LIB "${svg_SRC}")
+add_inkscape_source("${svg_SRC}")