Cmake: Fixed the extra -l in the link command, plus a add linking for all sub-libs of inkscape.

(bzr r7120)

32 files changed, 97 insertions, 39 deletions

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index e75c6174b..b5461487d 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -121,6 +121,6 @@ numeric/matrix.cpp
 )
 
 # make lib for 2geom
-ADD_LIBRARY(2geom ${LIB_TYPE} ${2GEOM_SRC})
+ADD_LIBRARY(2geom STATIC ${2GEOM_SRC})
 #TARGET_LINK_LIBRARIES(2geom blas gsl)
-TARGET_LINK_LIBRARIES(2geom "${LINK_GSL} ${GTK2_LINK_FLAGS}")
+TARGET_LINK_LIBRARIES(2geom ${INKSCAPE_LIBS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f7cc33dc..32c1f241b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -251,18 +251,19 @@ ENDFOREACH(srclistsrc)
 

 SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})

 

-#message(status "${INKSCAPE_LIBS}")

 ADD_LIBRARY(sp STATIC ${SP_SRC})

-

+TARGET_LINK_LIBRARIES(sp

+nr nrtype avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}

+)

 # make executable for INKSCAPE

 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})

 TARGET_LINK_LIBRARIES(inkscape

-    ${internalfolders} sp avoid cola croco gdl nr nrtype vpsc livarot ${INKSCAPE_LIBS}

+nr nrtype sp avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}

 )

 

 # make executable for INKVIEW

 #ADD_EXECUTABLE(inkview inkview.cpp)

 #TARGET_LINK_LIBRARIES(inkview

-#	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}

+#	2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}

 #)

 

diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index aa1a03911..c09279395 100644
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -3,4 +3,6 @@ editor.cpp
 application.cpp
 app-prototype.cpp
 )
-ADD_LIBRARY(application STATIC ${application_SRC})
\ No newline at end of file
+ADD_LIBRARY(application STATIC ${application_SRC})
+TARGET_LINK_LIBRARIES(application
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt
index 0708c3eff..a6b5b6883 100644
--- a/src/bind/CMakeLists.txt
+++ b/src/bind/CMakeLists.txt
@@ -2,4 +2,6 @@ SET(bind_SRC
 dobinding.cpp
 javabind.cpp
 )
-ADD_LIBRARY(bind STATIC ${bind_SRC})
\ No newline at end of file
+ADD_LIBRARY(bind STATIC ${bind_SRC})
+TARGET_LINK_LIBRARIES(bind
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt
index 27088acf9..26c4e6934 100644
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -7,4 +7,6 @@ sysv-heap.cpp
 timestamp.cpp
 gdk-event-latency-tracker.cpp
 )
-ADD_LIBRARY(debug STATIC ${debug_SRC})
\ No newline at end of file
+ADD_LIBRARY(debug STATIC ${debug_SRC})
+TARGET_LINK_LIBRARIES(debug
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index d5007b13d..9d2ed9eb8 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -23,4 +23,6 @@ text-edit.cpp
 unclump.cpp
 xml-tree.cpp
 )
-ADD_LIBRARY(dialogs STATIC ${dialogs_SRC})
\ No newline at end of file
+ADD_LIBRARY(dialogs STATIC ${dialogs_SRC})
+TARGET_LINK_LIBRARIES(dialogs
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index 66fa97462..9fa2304be 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -54,4 +54,6 @@ sp-ctrlline.cpp
 sp-ctrlquadr.cpp
 #testnr.cpp
 )
-ADD_LIBRARY(display STATIC ${display_SRC})
\ No newline at end of file
+ADD_LIBRARY(display STATIC ${display_SRC})
+TARGET_LINK_LIBRARIES(display
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 8a85390aa..7c434eb77 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -33,4 +33,6 @@ ${dom_odf_SRC}
 ${dom_util_SRC}
 #${dom_work_SRC}
 )
-ADD_LIBRARY(dom STATIC ${dom_SRC})
\ No newline at end of file
+ADD_LIBRARY(dom STATIC ${dom_SRC})
+TARGET_LINK_LIBRARIES(dom
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index d712eb61f..cd640d3d0 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -36,4 +36,6 @@ ${extension_internal_pdfinput_SRC}
 ${extension_param_SRC}
 ${extension_script_SRC}
 )
-ADD_LIBRARY(extension STATIC ${extension_SRC})
\ No newline at end of file
+ADD_LIBRARY(extension STATIC ${extension_SRC})
+TARGET_LINK_LIBRARIES(extension
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt
index e9baa6f88..554402d35 100644
--- a/src/filters/CMakeLists.txt
+++ b/src/filters/CMakeLists.txt
@@ -21,3 +21,5 @@ tile.cpp
 turbulence.cpp
 )
 ADD_LIBRARY(filters STATIC ${filters_SRC})
+TARGET_LINK_LIBRARIES(filters
+2geom ${INKSCAPE_LIBS})
diff --git a/src/graphlayout/CMakeLists.txt b/src/graphlayout/CMakeLists.txt
index 4ad15eb43..c8847a228 100644
--- a/src/graphlayout/CMakeLists.txt
+++ b/src/graphlayout/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(graphlayout_SRC
 graphlayout.cpp
 )
-ADD_LIBRARY(graphlayout STATIC ${graphlayout_SRC})
\ No newline at end of file
+ADD_LIBRARY(graphlayout STATIC ${graphlayout_SRC})
+TARGET_LINK_LIBRARIES(graphlayout
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index fe8179199..8f42a0d5a 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -24,4 +24,6 @@ sp-marshal.list
 ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
 )
-ADD_LIBRARY(helper STATIC ${helper_SRC})
\ No newline at end of file
+ADD_LIBRARY(helper STATIC ${helper_SRC})
+TARGET_LINK_LIBRARIES(helper
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/inkjar/CMakeLists.txt b/src/inkjar/CMakeLists.txt
index 2d4f52ca3..7a1e86525 100644
--- a/src/inkjar/CMakeLists.txt
+++ b/src/inkjar/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(inkjar_SRC
 jar.cpp
 )
-ADD_LIBRARY(inkjar STATIC ${inkjar_SRC})
\ No newline at end of file
+ADD_LIBRARY(inkjar STATIC ${inkjar_SRC})
+TARGET_LINK_LIBRARIES(inkjar
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 8db1b518c..13b8f568b 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -11,4 +11,6 @@ sys.cpp
 uristream.cpp
 xsltstream.cpp
 )
-ADD_LIBRARY(io STATIC ${io_SRC})
\ No newline at end of file
+ADD_LIBRARY(io STATIC ${io_SRC})
+TARGET_LINK_LIBRARIES(io
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
index f428c84c6..5f4dfa981 100644
--- a/src/jabber_whiteboard/CMakeLists.txt
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -18,4 +18,6 @@ session-file-selector.cpp
 session-manager.cpp
 ${jabber_whiteboard_dialog_SRC}
 )
-ADD_LIBRARY(jabber_whiteboard STATIC ${jabber_whiteboard_SRC})
\ No newline at end of file
+ADD_LIBRARY(jabber_whiteboard STATIC ${jabber_whiteboard_SRC})
+TARGET_LINK_LIBRARIES(jabber_whiteboard
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index db24527f1..df532c564 100644
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -13,3 +13,5 @@ vertices.cpp
 visibility.cpp
 )
 ADD_LIBRARY(avoid STATIC ${libavoid_SRC})
+TARGET_LINK_LIBRARIES(avoid
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index 564663aa0..b5f2e7f1f 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -8,3 +8,5 @@ shortest_paths.cpp
 straightener.cpp
 )
 ADD_LIBRARY(cola STATIC ${libcola_SRC})
+TARGET_LINK_LIBRARIES(cola
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt
index cee248a2a..3ca55b4b5 100644
--- a/src/libcroco/CMakeLists.txt
+++ b/src/libcroco/CMakeLists.txt
@@ -26,5 +26,7 @@ cr-term.c
 cr-tknzr.c
 cr-token.c
 cr-utils.c
-)

+)
 ADD_LIBRARY(croco STATIC ${libcroco_SRC})
+TARGET_LINK_LIBRARIES(croco
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index 0c12944a5..dea93e6bc 100644
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -18,8 +18,11 @@ gdl-dock-tablabel.c
 gdl-i18n.c
 gdl-stock.c
 gdl-switcher.c
-gdl-tools.h
libgdlmarshal.c
+gdl-tools.h
+libgdlmarshal.c
 libgdltypebuiltins.c
 ${GDL_WIN}
 )
 ADD_LIBRARY(gdl STATIC ${libgdl_SRC})
+TARGET_LINK_LIBRARIES(gdl
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index d29b83da8..3bf483181 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -33,4 +33,4 @@ testnr.cpp
 )
 ADD_LIBRARY(nr STATIC ${libnr_SRC})
 TARGET_LINK_LIBRARIES(nr
-	"${INKSCAPE_LINK_FLAGS}" 2geom )
+2geom ${INKSCAPE_LIBS})
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 28ff101c9..61ecb0091 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -16,4 +16,4 @@ TextWrapper.cpp
 )
 ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
 TARGET_LINK_LIBRARIES(nrtype
-	"${INKSCAPE_LINK_FLAGS}" nr )
+nr ${INKSCAPE_LIBS})
diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
index 23b6f84cd..4c3398b0f 100644
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/libvpsc/CMakeLists.txt
@@ -1,11 +1,13 @@
 SET(libvpsc_SRC

-block.cpp
-blocks.cpp
-constraint.cpp
-csolve_VPSC.cpp
-generate-constraints.cpp
-remove_rectangle_overlap.cpp
-solve_VPSC.cpp
+block.cpp

+blocks.cpp

+constraint.cpp

+csolve_VPSC.cpp

+generate-constraints.cpp

+remove_rectangle_overlap.cpp

+solve_VPSC.cpp

 variable.cpp

 )

-ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})
+ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})

+TARGET_LINK_LIBRARIES(vpsc

+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
index d12df1c3b..6eaf84d1c 100644
--- a/src/livarot/CMakeLists.txt
+++ b/src/livarot/CMakeLists.txt
@@ -21,3 +21,5 @@ sweep-tree.cpp
 sweep-tree-list.cpp
 )
 ADD_LIBRARY(livarot STATIC ${livarot_SRC})
+TARGET_LINK_LIBRARIES(nrtype
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 80a982bc3..adf172247 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -31,4 +31,6 @@ lpe-dynastroke.cpp
 spiro.cpp
 ${live_effects_parameter_SRC}
 )
-ADD_LIBRARY(live_effects STATIC ${live_effects_SRC})
\ No newline at end of file
+ADD_LIBRARY(live_effects STATIC ${live_effects_SRC})
+TARGET_LINK_LIBRARIES(live_effects
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt
index 207afd451..cb9a01b2f 100644
--- a/src/pedro/CMakeLists.txt
+++ b/src/pedro/CMakeLists.txt
@@ -8,4 +8,6 @@ pedrodom.cpp
 pedroutil.cpp
 pedroxmpp.cpp
 )
-ADD_LIBRARY(pedro STATIC ${pedro_SRC})
\ No newline at end of file
+ADD_LIBRARY(pedro STATIC ${pedro_SRC})
+TARGET_LINK_LIBRARIES(pedro
+${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/removeoverlap/CMakeLists.txt b/src/removeoverlap/CMakeLists.txt
index abb01eb55..7f71c29dc 100644
--- a/src/removeoverlap/CMakeLists.txt
+++ b/src/removeoverlap/CMakeLists.txt
@@ -1,4 +1,6 @@
 SET(removeoverlap_SRC
 removeoverlap.cpp
 )
-ADD_LIBRARY(removeoverlap STATIC ${removeoverlap_SRC})
\ No newline at end of file
+ADD_LIBRARY(removeoverlap STATIC ${removeoverlap_SRC})
+TARGET_LINK_LIBRARIES(removeoverlap
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index f015646b8..9d5dc0b7b 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -13,4 +13,6 @@ svg-length.cpp
 svg-path.cpp
 #test-stubs.cpp
 )
-ADD_LIBRARY(svg STATIC ${svg_SRC})
\ No newline at end of file
+ADD_LIBRARY(svg STATIC ${svg_SRC})
+TARGET_LINK_LIBRARIES(svg
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 0eb445dee..3cb378995 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -8,4 +8,6 @@ siox.cpp
 trace.cpp
 ${trace_potrace_SRC}
 )
-ADD_LIBRARY(trace STATIC ${trace_SRC})
\ No newline at end of file
+ADD_LIBRARY(trace STATIC ${trace_SRC})
+TARGET_LINK_LIBRARIES(trace
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index f788a04bf..01dadb7c2 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -19,4 +19,6 @@ ${ui_dialog_SRC}
 ${ui_view_SRC}
 ${ui_widget_SRC}
 )
-ADD_LIBRARY(ui STATIC ${ui_SRC})
\ No newline at end of file
+ADD_LIBRARY(ui STATIC ${ui_SRC})
+TARGET_LINK_LIBRARIES(ui
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 5e193a8f2..18237ac75 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -2,4 +2,6 @@ SET(util_SRC
 share.cpp
 units.cpp
 )
-ADD_LIBRARY(util STATIC ${util_SRC})
\ No newline at end of file
+ADD_LIBRARY(util STATIC ${util_SRC})
+TARGET_LINK_LIBRARIES(util
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 24c1d30d2..45f013f16 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -31,4 +31,6 @@ sp-xmlview-content.cpp
 sp-xmlview-tree.cpp
 toolbox.cpp
 )
-ADD_LIBRARY(widgets STATIC ${widgets_SRC})
\ No newline at end of file
+ADD_LIBRARY(widgets STATIC ${widgets_SRC})
+TARGET_LINK_LIBRARIES(widgets
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 4036cb1af..775a4e72f 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -16,4 +16,6 @@ simple-document.cpp
 simple-node.cpp
 subtree.cpp
 )
-ADD_LIBRARY(xml STATIC ${xml_SRC})
\ No newline at end of file
+ADD_LIBRARY(xml STATIC ${xml_SRC})
+TARGET_LINK_LIBRARIES(xml
+2geom ${INKSCAPE_LIBS})
\ No newline at end of file