work in progress cmake commit:

- cmake now builds all files that automake does but does NOT link yet
- inlcudes nasty hard coded paths and libs (will replace once linking works)

(bzr r10272)

3 files changed, 55 insertions, 53 deletions

diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 3bf483181..798eb0d11 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,36 +1,37 @@
-SET(libnr_SRC
-#in-svg-plane-test.cpp
-nr-blit.cpp
-nr-compose.cpp
-nr-compose-transform.cpp
-nr-gradient.cpp
-nr-matrix.cpp
-nr-matrix-div.cpp
-nr-matrix-fns.cpp
-nr-matrix-rotate-ops.cpp
-nr-object.cpp
-nr-pixblock.cpp
-nr-pixblock-line.cpp
-nr-pixblock-pattern.cpp
-nr-pixblock-pixel.cpp
-nr-point-fns.cpp
-#nr-point-fns-test.cpp
-nr-rect.cpp
-nr-rect-l.cpp
-nr-rotate-fns.cpp
-#nr-rotate-fns-test.cpp
-nr-rotate-matrix-ops.cpp
-nr-scale-matrix-ops.cpp
-nr-scale-translate-ops.cpp
-nr-translate-matrix-ops.cpp
-nr-translate-rotate-ops.cpp
-nr-translate-scale-ops.cpp
-#nr-translate-test.cpp
-nr-types.cpp
-#nr-types-test.cpp
-nr-values.cpp
-testnr.cpp
+
+set(libnr_SRC
+	#in-svg-plane-test.cpp
+	nr-blit.cpp
+	nr-compose.cpp
+	nr-compose-transform.cpp
+	nr-gradient.cpp
+	nr-matrix.cpp
+	nr-matrix-div.cpp
+	nr-matrix-fns.cpp
+	nr-matrix-rotate-ops.cpp
+	nr-object.cpp
+	nr-pixblock.cpp
+	nr-pixblock-line.cpp
+	nr-pixblock-pattern.cpp
+	nr-pixblock-pixel.cpp
+	nr-point-fns.cpp
+	#nr-point-fns-test.cpp
+	nr-rect.cpp
+	nr-rect-l.cpp
+	nr-rotate-fns.cpp
+	#nr-rotate-fns-test.cpp
+	nr-rotate-matrix-ops.cpp
+	nr-scale-matrix-ops.cpp
+	nr-scale-translate-ops.cpp
+	nr-translate-matrix-ops.cpp
+	nr-translate-rotate-ops.cpp
+	nr-translate-scale-ops.cpp
+	#nr-translate-test.cpp
+	nr-types.cpp
+	#nr-types-test.cpp
+	nr-values.cpp
+	#testnr.cpp
 )
-ADD_LIBRARY(nr STATIC ${libnr_SRC})
-TARGET_LINK_LIBRARIES(nr
-2geom ${INKSCAPE_LIBS})
+
+add_library(nr STATIC ${libnr_SRC})
+target_link_libraries(nr 2geom ${INKSCAPE_LIBS})
diff --git a/src/libnr/testnr.cpp b/src/libnr/testnr.cpp
index 12dce4c52..7ce01afab 100644
--- a/src/libnr/testnr.cpp
+++ b/src/libnr/testnr.cpp
@@ -9,6 +9,8 @@
  * This code is in public domain
  */
 
+#include <stdio.h>
+
 #if defined (_WIN32) || defined (__WIN32__)
 # include <windows.h> 
 #include <glib.h>
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 61ecb0091..4402e5066 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -1,19 +1,18 @@
-SET(libnrtype_SRC
-FontFactory.cpp
-FontInstance.cpp
-font-lister.cpp
-font-style-to-pos.cpp
-Layout-TNG.cpp
-Layout-TNG-Compute.cpp
-Layout-TNG-Input.cpp
-Layout-TNG-OutIter.cpp
-Layout-TNG-Output.cpp
-Layout-TNG-Scanline-Makers.cpp
-nr-type-pos-def.cpp
-nr-type-primitives.cpp
-RasterFont.cpp
-TextWrapper.cpp
+set(libnrtype_SRC
+	FontFactory.cpp
+	FontInstance.cpp
+	font-lister.cpp
+	font-style-to-pos.cpp
+	Layout-TNG.cpp
+	Layout-TNG-Compute.cpp
+	Layout-TNG-Input.cpp
+	Layout-TNG-OutIter.cpp
+	Layout-TNG-Output.cpp
+	Layout-TNG-Scanline-Makers.cpp
+	nr-type-pos-def.cpp
+	nr-type-primitives.cpp
+	RasterFont.cpp
+	TextWrapper.cpp
 )
-ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
-TARGET_LINK_LIBRARIES(nrtype
-nr ${INKSCAPE_LIBS})
+add_library(nrtype STATIC ${libnrtype_SRC})
+target_link_libraries(nrtype nr ${INKSCAPE_LIBS})