cmake:

- group source/headers per library (for some IDE's)
- include headers with source listing (also for IDE's)
- remove unneeded Find modules

(bzr r10281)

2 files changed, 93 insertions, 7 deletions

diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 0d3202636..994c5d348 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(nr_SRC
-	#in-svg-plane-test.cpp
+	# in-svg-plane-test.cpp
 	nr-blit.cpp
 	nr-compose.cpp
 	nr-compose-transform.cpp
@@ -15,11 +15,11 @@ set(nr_SRC
 	nr-pixblock-pattern.cpp
 	nr-pixblock-pixel.cpp
 	nr-point-fns.cpp
-	#nr-point-fns-test.cpp
+	# nr-point-fns-test.cpp
 	nr-rect.cpp
 	nr-rect-l.cpp
 	nr-rotate-fns.cpp
-	#nr-rotate-fns-test.cpp
+	# nr-rotate-fns-test.cpp
 	nr-rotate-matrix-ops.cpp
 	nr-scale-matrix-ops.cpp
 	nr-scale-translate-ops.cpp
@@ -28,9 +28,74 @@ set(nr_SRC
 	nr-translate-scale-ops.cpp
 	#nr-translate-test.cpp
 	nr-types.cpp
-	#nr-types-test.cpp
+	# nr-types-test.cpp
 	nr-values.cpp
-	#testnr.cpp
+	# testnr.cpp
+
+	# -------
+	# Headers
+	# in-svg-plane-test.h
+	in-svg-plane.h
+	nr-blit.h
+	nr-compose-reference.h
+	nr-compose-test.h
+	nr-compose-transform.h
+	nr-compose.h
+	nr-convert2geom.h
+	nr-convex-hull-ops.h
+	nr-convex-hull.h
+	nr-coord.h
+	nr-dim2.h
+	nr-forward.h
+	nr-gradient.h
+	nr-i-coord.h
+	nr-macros.h
+	nr-matrix-div.h
+	nr-matrix-fns.h
+	nr-matrix-ops.h
+	nr-matrix-rotate-ops.h
+	nr-matrix-scale-ops.h
+	nr-matrix-test.h
+	nr-matrix-translate-ops.h
+	nr-matrix.h
+	nr-maybe.h
+	nr-object.h
+	nr-path-code.h
+	nr-pixblock-line.h
+	nr-pixblock-pattern.h
+	nr-pixblock-pixel.h
+	nr-pixblock.h
+	nr-pixops.h
+	# nr-point-fns-test.h
+	nr-point-fns.h
+	nr-point-l.h
+	nr-point-matrix-ops.h
+	nr-point-ops.h
+	nr-point.h
+	nr-rect-l.h
+	nr-rect-ops.h
+	nr-rect.h
+	nr-render.h
+	nr-rotate-fns-test.h
+	nr-rotate-fns.h
+	nr-rotate-matrix-ops.h
+	nr-rotate-ops.h
+	nr-rotate-test.h
+	nr-rotate.h
+	nr-scale-matrix-ops.h
+	nr-scale-ops.h
+	nr-scale-test.h
+	nr-scale-translate-ops.h
+	nr-scale.h
+	nr-translate-matrix-ops.h
+	nr-translate-ops.h
+	nr-translate-rotate-ops.h
+	nr-translate-scale-ops.h
+	# nr-translate-test.h
+	nr-translate.h
+	# nr-types-test.h
+	nr-types.h
+	nr-values.h
 )
 
-add_library(nr_LIB ${nr_SRC})
+add_inkscape_lib(nr_LIB "${nr_SRC}")
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index d5f9b846f..835665761 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -14,6 +14,27 @@ set(nrtype_SRC
 	nr-type-primitives.cpp
 	RasterFont.cpp
 	TextWrapper.cpp
+
+	FontFactory.h
+	Layout-TNG-Scanline-Maker.h
+	Layout-TNG.h
+	RasterFont.h
+	TextWrapper.h
+	boundary-type.h
+	font-glyph.h
+	font-instance.h
+	font-lister.h
+	font-style-to-pos.h
+	font-style.h
+	nr-type-pos-def.h
+	nr-type-primitives.h
+	nrtype-forward.h
+	one-box.h
+	one-glyph.h
+	one-para.h
+	raster-glyph.h
+	raster-position.h
+	text-boundary.h
 )
 
-add_library(nrtype_LIB ${nrtype_SRC})
+add_inkscape_lib(nrtype_LIB "${nrtype_SRC}")