Merge from trunk

(bzr r9508.1.89)

1 files changed, 22 insertions, 11 deletions

diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index b5f2e7f1f..c89ffc692 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -1,12 +1,23 @@
-SET(libcola_SRC
-cola.cpp
-conjugate_gradient.cpp
-connected_components.cpp
-cycle_detector.cpp
-gradient_projection.cpp
-shortest_paths.cpp
-straightener.cpp
+
+set(libcola_SRC
+	cola.cpp
+	conjugate_gradient.cpp
+	connected_components.cpp
+	# cycle_detector.cpp
+	gradient_projection.cpp
+	shortest_paths.cpp
+	straightener.cpp
+
+
+	# -------
+	# Headers
+	cola.h
+	conjugate_gradient.h
+	# cycle_detector.h
+	defs.h
+	gradient_projection.h
+	shortest_paths.h
+	straightener.h
 )
-ADD_LIBRARY(cola STATIC ${libcola_SRC})
-TARGET_LINK_LIBRARIES(cola
-${INKSCAPE_LIBS})
\ No newline at end of file
+
+add_inkscape_lib(cola_LIB "${libcola_SRC}")