Cmake: added livarot as a lib, fixes problem with linking

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d135dc04fcc964bd635c95020f575424dcf70eff..56526705c7d57906da051898ab2c3fe1a078ecda 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,8 @@ libcroco
 libgdl\r
 libnr\r
 libnrtype\r
-libvpsc\r
+libvpsc
+livarot\r
 )\r
 \r
 FOREACH(dirlist ${libfolders})\r
@@ -305,7 +306,7 @@ ${ONLY_WIN}
 # make executable for INKSCAPE\r
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
 TARGET_LINK_LIBRARIES(inkscape\r
-       "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc\r
+       "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
 )\r
 #INSTALL(TARGETS INKSCAPE\r
 #  RUNTIME DESTINATION bin\r

diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index e1ec8bb69cbba9068cd76a6fa8c941778db027df..9adfb1236d5cc2c570f88c7460d6b39ecd082cc9 100644 (file)
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -100,3 +100,5 @@ nr-values.h
 testnr.cpp\r
 )\r
 ADD_LIBRARY(nr STATIC ${libnr_SRC})
+TARGET_LINK_LIBRARIES(nr\r
+       "${INKSCAPE_LINK_FLAGS}" 2geom )

diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index ba5c40ca598d1aedb214a3a51aa192f169a7b0d1..905fc44c35ab1ee17db5f9cf0cbbbf08f5230049 100644 (file)
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -35,3 +35,5 @@ TextWrapper.cpp
 TextWrapper.h\r
 )\r
 ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
+TARGET_LINK_LIBRARIES(nrtype\r
+       "${INKSCAPE_LINK_FLAGS}" nr )

diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5838638
--- /dev/null
+++ b/src/livarot/CMakeLists.txt
@@ -0,0 +1,39 @@
+SET(livarot_SRC\r
+AlphaLigne.cpp
+AlphaLigne.h
+AVL.cpp
+AVL.h
+BitLigne.cpp
+BitLigne.h
+CMakeLists.txt
+float-line.cpp
+float-line.h
+int-line.cpp
+int-line.h
+LivarotDefs.h
+livarot-forward.h
+Livarot.h
+PathConversion.cpp
+Path.cpp
+PathCutting.cpp
+path-description.cpp
+path-description.h
+Path.h
+PathOutline.cpp
+PathSimplify.cpp
+PathStroke.cpp
+Shape.cpp
+ShapeDraw.cpp
+Shape.h
+ShapeMisc.cpp
+ShapeRaster.cpp
+ShapeSweep.cpp
+sweep-event.cpp
+sweep-event.h
+sweep-event-queue.h
+sweep-tree.cpp
+sweep-tree.h
+sweep-tree-list.cpp
+sweep-tree-list.h\r
+)\r
+ADD_LIBRARY(livarot STATIC ${livarot_SRC})