cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs.

(bzr r10274)

28 files changed, 111 insertions, 85 deletions

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index 0ef925a55..bdb24cc59 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-set(2GEOM_SRC
+set(2geom_SRC
 	affine.cpp
 	basic-intersection.cpp
 	bezier-clipping.cpp
@@ -121,7 +121,7 @@ set(2GEOM_SRC
 	numeric/vector.h
 )
 
-# make lib for 2geom
-add_library(2geom STATIC ${2GEOM_SRC})
-#TARGET_LINK_LIBRARIES(2geom blas gsl)
-target_link_libraries(2geom ${INKSCAPE_LIBS})
+# make lib for 2geom_LIB
+add_library(2geom_LIB STATIC ${2geom_SRC})
+#TARGET_LINK_LIBRARIES(2geom_LIB blas_LIB gsl_LIB)
+target_link_libraries(2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08ea05387..fa5a5b34e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,8 +129,8 @@ set(INKSCAPE_SRC
 	inkscape-version.cpp

 	inkscape.cpp

 	inkscape.rc

-	inkview.cpp

-	inkview.rc

+	# inkview.cpp

+	# inkview.rc

 	interface.cpp

 	knot-holder-entity.cpp

 	knot.cpp

@@ -264,17 +264,34 @@ set(INKSCAPE_SRC
 	${GlibOutput}

 )

 

-add_library(sp STATIC ${SP_SRC})

-target_link_libraries(sp

-	nr

-	nrtype

-	avoid

-	cola

-	croco

-	gdl

-	vpsc

-	livarot

-	${internalfolders}

+add_library(sp_LIB STATIC ${SP_SRC})

+

+target_link_libraries(

+	sp_LIB

+	nr_LIB

+	nrtype_LIB

+	avoid_LIB

+	cola_LIB

+	croco_LIB

+	gdl_LIB

+	vpsc_LIB

+	livarot_LIB

+

+	bind_LIB

+	display_LIB

+	dom_LIB

+	extension_LIB

+	filters_LIB

+	helper_LIB

+	io_LIB

+	live_effects_LIB

+	svg_LIB

+	trace_LIB

+	ui_LIB

+	widgets_LIB

+	xml_LIB

+	2geom_LIB

+

 	${INKSCAPE_LIBS}

 )

 

@@ -282,16 +299,15 @@ target_link_libraries(sp
 add_executable(inkscape ${INKSCAPE_SRC})

 

 target_link_libraries(inkscape

-	nr

-	nrtype

-	sp

-	avoid

-	cola

-	croco

-	gdl

-	vpsc

-	livarot

-	${internalfolders}

+	nr_LIB

+	nrtype_LIB

+	sp_LIB

+	avoid_LIB

+	cola_LIB

+	croco_LIB

+	gdl_LIB

+	vpsc_LIB

+	livarot_LIB

 	${INKSCAPE_LIBS}

 	

 	

@@ -348,6 +364,15 @@ target_link_libraries(inkscape
 # make executable for INKVIEW

 #ADD_EXECUTABLE(inkview inkview.cpp)

 #TARGET_LINK_LIBRARIES(inkview

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

+#	2geom_LIB

+#	avoid_LIB

+#	cola_LIB

+#	croco_LIB

+#	gdl_LIB

+#	nr_LIB

+#	nrtype_LIB

+#	vpsc_LIB

+#	livarot_LIB

+#	sp_LIB

 #)

 

diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt
index 08b7876c2..71bf0b602 100644
--- a/src/bind/CMakeLists.txt
+++ b/src/bind/CMakeLists.txt
@@ -2,5 +2,5 @@ set(bind_SRC
 	dobinding.cpp
 	javabind.cpp
 )
-add_library(bind STATIC ${bind_SRC})
-target_link_libraries(bind ${INKSCAPE_LIBS})
+add_library(bind_LIB STATIC ${bind_SRC})
+target_link_libraries(bind_LIB ${INKSCAPE_LIBS})
diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt
index 2dab10144..6727817f9 100644
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -9,5 +9,5 @@ set(debug_SRC
 	gdk-event-latency-tracker.cpp
 )
 
-add_library(debug STATIC ${debug_SRC})
-target_link_libraries(debug 2geom ${INKSCAPE_LIBS})
+add_library(debug_LIB STATIC ${debug_SRC})
+target_link_libraries(debug_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index aa8f836d5..d22b5750c 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -9,5 +9,5 @@ set(dialogs_SRC
 	text-edit.cpp
 	xml-tree.cpp
 )
-add_library(dialogs STATIC ${dialogs_SRC})
-target_link_libraries(dialogs 2geom ${INKSCAPE_LIBS})
+add_library(dialogs_LIB STATIC ${dialogs_SRC})
+target_link_libraries(dialogs_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index a46ff4e84..86f122297 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -62,5 +62,5 @@ include_directories(
 	"${CMAKE_SOURCE_DIR}/src"
 )
 
-add_library(display STATIC ${display_SRC})
-target_link_libraries(display 2geom ${INKSCAPE_LIBS})
+add_library(display_LIB STATIC ${display_SRC})
+target_link_libraries(display_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 3648010ac..66571d06a 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -34,5 +34,5 @@ set(dom_SRC
 	#${dom_work_SRC}
 )
 
-add_library(dom STATIC ${dom_SRC})
-target_link_libraries(dom 2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(dom_LIB STATIC ${dom_SRC})
+target_link_libraries(dom_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index 73697fbe7..47cfbe9e4 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -37,5 +37,5 @@ set(extension_SRC
 	${extension_script_SRC}
 )
 
-add_library(extension STATIC ${extension_SRC})
-target_link_libraries(extension 2geom ${INKSCAPE_LIBS})
+add_library(extension_LIB STATIC ${extension_SRC})
+target_link_libraries(extension_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt
index 32819fa68..a1bec4642 100644
--- a/src/filters/CMakeLists.txt
+++ b/src/filters/CMakeLists.txt
@@ -20,5 +20,5 @@ set(filters_SRC
 	tile.cpp
 	turbulence.cpp
 )
-add_library(filters STATIC ${filters_SRC})
-target_link_libraries(filters 2geom ${INKSCAPE_LIBS})
+add_library(filters_LIB STATIC ${filters_SRC})
+target_link_libraries(filters_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index e2ca2336d..86c5eea10 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -2,7 +2,7 @@ include(UseGlibMarshal)
 
 GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper")
 
-set(GlibOutput
+set(sp_marshal_SRC
 	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
 	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
 )
@@ -23,9 +23,8 @@ set(helper_SRC
 	sp-marshal.cpp
 	sp-marshal.list
 	# we generate this file and it's .h counter-part
-	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
-	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
+	${sp_marshal_SRC}
 )
 
-add_library(helper STATIC ${helper_SRC})
-target_link_libraries(helper 2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(helper_LIB STATIC ${helper_SRC})
+target_link_libraries(helper_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index b60830042..88040744b 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -11,5 +11,6 @@ set(io_SRC
 	uristream.cpp
 	xsltstream.cpp
 )
-add_library(io STATIC ${io_SRC})
-target_link_libraries(io 2geom ${INKSCAPE_LIBS})
+
+add_library(io_LIB STATIC ${io_SRC})
+target_link_libraries(io_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
index 6975d06d6..dbe9f1e1e 100644
--- a/src/jabber_whiteboard/CMakeLists.txt
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -19,5 +19,5 @@ set(jabber_whiteboard_SRC
 	${jabber_whiteboard_dialog_SRC}
 )
 
-add_library(jabber_whiteboard STATIC ${jabber_whiteboard_SRC})
-target_link_libraries(jabber_whiteboard 2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(jabber_whiteboard_LIB STATIC ${jabber_whiteboard_SRC})
+target_link_libraries(jabber_whiteboard_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index b76cf1d39..6eb6bdd1d 100644
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -14,5 +14,5 @@ set(libavoid_SRC
 	vpsc.cpp
 )
 
-add_library(avoid STATIC ${libavoid_SRC})
-target_link_libraries(avoid ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(avoid_LIB STATIC ${libavoid_SRC})
+target_link_libraries(avoid_LIB ${INKSCAPE_LIBS})
diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index 43c510f13..40c92d578 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -7,5 +7,5 @@ set(libcola_SRC
 	shortest_paths.cpp
 	straightener.cpp
 )
-add_library(cola STATIC ${libcola_SRC})
-target_link_libraries(cola ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(cola_LIB STATIC ${libcola_SRC})
+target_link_libraries(cola_LIB ${INKSCAPE_LIBS})
diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt
index 7e8aa9176..3aae8eac4 100644
--- a/src/libcroco/CMakeLists.txt
+++ b/src/libcroco/CMakeLists.txt
@@ -29,5 +29,5 @@ set(libcroco_SRC
 	cr-utils.c
 )
 
-add_library(croco STATIC ${libcroco_SRC})
-target_link_libraries(croco ${INKSCAPE_LIBS})
+add_library(croco_LIB STATIC ${libcroco_SRC})
+target_link_libraries(croco_LIB ${INKSCAPE_LIBS})
diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index f59ec5420..6411579b3 100644
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -25,5 +25,5 @@ if(WIN32)
 	)
 endif()
 
-ADD_LIBRARY(gdl STATIC ${libgdl_SRC})
-TARGET_LINK_LIBRARIES(gdl ${INKSCAPE_LIBS})
+ADD_LIBRARY(gdl_LIB STATIC ${libgdl_SRC})
+TARGET_LINK_LIBRARIES(gdl_LIB ${INKSCAPE_LIBS})
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 798eb0d11..28fee7b77 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -33,5 +33,5 @@ set(libnr_SRC
 	#testnr.cpp
 )
 
-add_library(nr STATIC ${libnr_SRC})
-target_link_libraries(nr 2geom ${INKSCAPE_LIBS})
+add_library(nr_LIB STATIC ${libnr_SRC})
+target_link_libraries(nr_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 4402e5066..75bb5f57b 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -14,5 +14,5 @@ set(libnrtype_SRC
 	RasterFont.cpp
 	TextWrapper.cpp
 )
-add_library(nrtype STATIC ${libnrtype_SRC})
-target_link_libraries(nrtype nr ${INKSCAPE_LIBS})
+add_library(nrtype_LIB STATIC ${libnrtype_SRC})
+target_link_libraries(nrtype_LIB nr_LIB ${INKSCAPE_LIBS})
diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
index 57811ad0a..0a91c3516 100644
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/libvpsc/CMakeLists.txt
@@ -10,5 +10,5 @@ set(libvpsc_SRC
 	pairingheap/PairingHeap.cpp

 )

 

-add_library(vpsc STATIC ${libvpsc_SRC})

-target_link_libraries(vpsc ${INKSCAPE_LIBS})

+add_library(vpsc_LIB STATIC ${libvpsc_SRC})

+target_link_libraries(vpsc_LIB ${INKSCAPE_LIBS})

diff --git a/src/livarot/CMakeLists.txt b/src/livarot/CMakeLists.txt
index 965926fb8..d8f4ba05d 100644
--- a/src/livarot/CMakeLists.txt
+++ b/src/livarot/CMakeLists.txt
@@ -21,5 +21,5 @@ set(livarot_SRC
 	sweep-tree-list.cpp
 )
 
-add_library(livarot STATIC ${livarot_SRC})
-target_link_libraries(nrtype ${INKSCAPE_LIBS})
+add_library(livarot_LIB STATIC ${livarot_SRC})
+target_link_libraries(nrtype_LIB ${INKSCAPE_LIBS})
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 0edbbc922..61fedbe66 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -44,5 +44,5 @@ set(live_effects_SRC
 	${live_effects_parameter_SRC}
 )
 
-add_library(live_effects STATIC ${live_effects_SRC})
-target_link_libraries(live_effects 2geom ${INKSCAPE_LIBS})
+add_library(live_effects_LIB STATIC ${live_effects_SRC})
+target_link_libraries(live_effects_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt
index 5595d755e..4de3592db 100644
--- a/src/pedro/CMakeLists.txt
+++ b/src/pedro/CMakeLists.txt
@@ -8,5 +8,5 @@ set(pedro_SRC
 	pedroutil.cpp
 	pedroxmpp.cpp
 )
-add_library(pedro STATIC ${pedro_SRC})
-target_link_libraries(pedro ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(pedro_LIB STATIC ${pedro_SRC})
+target_link_libraries(pedro_LIB ${INKSCAPE_LIBS})
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index b2c4b918e..4501983bb 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -14,5 +14,5 @@ set(svg_SRC
 	#test-stubs.cpp
 )
 
-add_library(svg STATIC ${svg_SRC})
-target_link_libraries(svg 2geom ${INKSCAPE_LIBS})
+add_library(svg_LIB STATIC ${svg_SRC})
+target_link_libraries(svg_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 312ee209c..d3bdcb6b1 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(potrace)
+
 set(trace_SRC
 	filterset.cpp
 	imagemap.cpp
@@ -8,6 +9,6 @@ set(trace_SRC
 	trace.cpp
 	${trace_potrace_SRC}
 )
-ADD_LIBRARY(trace STATIC ${trace_SRC})
-TARGET_LINK_LIBRARIES(trace
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+
+ADD_LIBRARY(trace_LIB STATIC ${trace_SRC})
+TARGET_LINK_LIBRARIES(trace_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 28dcd1ded..5fa882f1a 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -42,5 +42,5 @@ include_directories(
 	"${CMAKE_SOURCE_DIR}/extension/dbus"
 )
 
-add_library(ui STATIC ${ui_SRC})
-target_link_libraries(ui 2geom ${INKSCAPE_LIBS})
+add_library(ui_LIB STATIC ${ui_SRC})
+target_link_libraries(ui_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 936a5fae9..330d49662 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -7,5 +7,5 @@ set(util_SRC
 	units.cpp
 )
 
-add_library(util STATIC ${util_SRC})
-target_link_libraries(util 2geom ${INKSCAPE_LIBS})
+add_library(util_LIB STATIC ${util_SRC})
+target_link_libraries(util_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index b698ced98..4c622fbec 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -36,5 +36,5 @@ set(widgets_SRC
 	toolbox.cpp
 )
 
-add_library(widgets STATIC ${widgets_SRC})
-target_link_libraries(widgets 2geom ${INKSCAPE_LIBS})
+add_library(widgets_LIB STATIC ${widgets_SRC})
+target_link_libraries(widgets_LIB 2geom_LIB ${INKSCAPE_LIBS})
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index b92d82489..1aafe2d21 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -17,5 +17,5 @@ set(xml_SRC
 	rebase-hrefs.cpp
 )
 
-add_library(xml STATIC ${xml_SRC})
-target_link_libraries(xml 2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+add_library(xml_LIB STATIC ${xml_SRC})
+target_link_libraries(xml_LIB 2geom_LIB ${INKSCAPE_LIBS})