From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Sun, 27 Apr 2008 22:31:54 +0000 (+0000)
Subject: Cmake: added livarot as a lib, fixes problem with linking
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ccaa842a0dc9cbeb8214cf55f3b454713f084477;p=inkscape.git

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d135dc04f..56526705c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,7 +81,8 @@ libcroco
 libgdl
 libnr
 libnrtype
-libvpsc
+libvpsc
+livarot
 )
 
 FOREACH(dirlist ${libfolders})
@@ -305,7 +306,7 @@ ${ONLY_WIN}
 # make executable for INKSCAPE
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})
 TARGET_LINK_LIBRARIES(inkscape
-	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc
+	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot
 )
 #INSTALL(TARGETS INKSCAPE
 #  RUNTIME DESTINATION bin
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index e1ec8bb69..9adfb1236 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -100,3 +100,5 @@ nr-values.h
 testnr.cpp
 )
 ADD_LIBRARY(nr STATIC ${libnr_SRC})
+TARGET_LINK_LIBRARIES(nr
+	"${INKSCAPE_LINK_FLAGS}" 2geom )
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index ba5c40ca5..905fc44c3 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -35,3 +35,5 @@ TextWrapper.cpp
 TextWrapper.h
 )
 ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
+TARGET_LINK_LIBRARIES(nrtype
+	"${INKSCAPE_LINK_FLAGS}" nr )
diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
new file mode 100644
index 000000000..583863890
--- /dev/null
+++ b/src/livarot/CMakeLists.txt
@@ -0,0 +1,39 @@
+SET(livarot_SRC
+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
+)
+ADD_LIBRARY(livarot STATIC ${livarot_SRC})