summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt60
-rw-r--r--src/bind/CMakeLists.txt3
-rw-r--r--src/debug/CMakeLists.txt3
-rw-r--r--src/dialogs/CMakeLists.txt3
-rw-r--r--src/display/CMakeLists.txt7
-rw-r--r--src/extension/CMakeLists.txt11
-rw-r--r--src/filters/CMakeLists.txt3
-rw-r--r--src/helper/CMakeLists.txt3
-rw-r--r--src/io/CMakeLists.txt3
-rw-r--r--src/jabber_whiteboard/CMakeLists.txt3
-rw-r--r--src/libnr/CMakeLists.txt4
-rw-r--r--src/libnrtype/CMakeLists.txt4
-rw-r--r--src/live_effects/CMakeLists.txt3
-rw-r--r--src/pedro/CMakeLists.txt3
-rw-r--r--src/svg/CMakeLists.txt3
-rw-r--r--src/trace/CMakeLists.txt3
-rw-r--r--src/ui/CMakeLists.txt11
-rw-r--r--src/util/CMakeLists.txt3
-rw-r--r--src/widgets/CMakeLists.txt3
-rw-r--r--src/xml/CMakeLists.txt3
20 files changed, 59 insertions, 80 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de6175134..72644b416 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,8 +129,6 @@ set(inkscape_SRC
inkscape-version.cpp
inkscape.cpp
inkscape.rc
- # inkview.cpp
- # inkview.rc
interface.cpp
knot-holder-entity.cpp
knot.cpp
@@ -141,7 +139,6 @@ set(inkscape_SRC
line-snapper.cpp
lpe-tool-context.cpp
main-cmdlineact.cpp
- main.cpp
marker.cpp
measure-context.cpp
media.cpp
@@ -214,8 +211,6 @@ endif()
# All folders for internal inkscape
set(internalfolders
- #algorithms
- #api
bind
debug
dialogs
@@ -230,7 +225,6 @@ set(internalfolders
# pedro
svg
trace
- #traits
ui
util
widgets
@@ -244,10 +238,10 @@ set(libfolders
libcola
libcroco
libgdl
- libnr
- libnrtype
libvpsc
livarot
+ libnr
+ libnrtype
)
set(dirs
@@ -259,18 +253,28 @@ foreach(srclistsrc ${dirs})
add_subdirectory(${srclistsrc})
endforeach()
+get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC)
+
set(inkscape_SRC
+ ${inkscape_global_SRC}
${inkscape_SRC}
- ${GlibOutput}
)
add_library(sp_LIB ${sp_SRC})
+add_library(inkscape_LIB ${inkscape_SRC})
# make executable for INKSCAPE
-add_executable(inkscape ${inkscape_SRC})
+add_executable(inkscape main.cpp)
target_link_libraries(inkscape
# order from automake
+ sp_LIB
+ inkscape_LIB
+ sp_LIB # annoying, we need both!
+
+ nr_LIB
+ nrtype_LIB
+
dom_LIB
croco_LIB
avoid_LIB
@@ -280,26 +284,6 @@ target_link_libraries(inkscape
livarot_LIB
2geom_LIB
- # guessing these ones
- ui_LIB
- bind_LIB
- debug_LIB
- dialogs_LIB
- display_LIB
- extension_LIB
- filters_LIB
- helper_LIB
- io_LIB
- nr_LIB
- nrtype_LIB
- sp_LIB
- svg_LIB
- trace_LIB
- util_LIB
- widgets_LIB
- xml_LIB
- live_effects_LIB
-
${INKSCAPE_LIBS}
@@ -353,18 +337,8 @@ target_link_libraries(inkscape
)
+# TODO
# make executable for INKVIEW
-#ADD_EXECUTABLE(inkview inkview.cpp)
-#TARGET_LINK_LIBRARIES(inkview
-# 2geom_LIB
-# avoid_LIB
-# cola_LIB
-# croco_LIB
-# gdl_LIB
-# nr_LIB
-# nrtype_LIB
-# vpsc_LIB
-# livarot_LIB
-# sp_LIB
-#)
+#add_executable(inkview inkview.cpp)
+# ...
diff --git a/src/bind/CMakeLists.txt b/src/bind/CMakeLists.txt
index d0f7c7ca0..8a98e20a3 100644
--- a/src/bind/CMakeLists.txt
+++ b/src/bind/CMakeLists.txt
@@ -4,4 +4,5 @@ set(bind_SRC
javabind.cpp
)
-add_library(bind_LIB ${bind_SRC})
+# add_library(bind_LIB ${bind_SRC})
+add_inkscape_source("${bind_SRC}")
diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt
index 0c5760366..9039d52bb 100644
--- a/src/debug/CMakeLists.txt
+++ b/src/debug/CMakeLists.txt
@@ -9,4 +9,5 @@ set(debug_SRC
gdk-event-latency-tracker.cpp
)
-add_library(debug_LIB ${debug_SRC})
+# add_library(debug_LIB ${debug_SRC})
+add_inkscape_source("${debug_SRC}")
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index bd6942ca6..f2d05a02b 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -11,4 +11,5 @@ set(dialogs_SRC
xml-tree.cpp
)
-add_library(dialogs_LIB ${dialogs_SRC})
+# add_library(dialogs_LIB ${dialogs_SRC})
+add_inkscape_source("${dialogs_SRC}")
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index ff0b7eac1..056067ea4 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -59,8 +59,5 @@ set(display_SRC
sp-ctrlquadr.cpp
)
-include_directories(
- "${CMAKE_SOURCE_DIR}/src"
-)
-
-add_library(display_LIB ${display_SRC})
+# add_library(display_LIB ${display_SRC})
+add_inkscape_source("${display_SRC}")
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index 3d8777e3a..b2550361f 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -29,12 +29,12 @@ set(extension_SRC
param/parameter.cpp
param/radiobutton.cpp
param/string.cpp
-
+
internal/bluredge.cpp
internal/cairo-png-out.cpp
internal/cairo-ps-out.cpp
- # internal/cairo-render-context.cpp # XXX MUST GET THIS WORKING
- # internal/cairo-renderer.cpp # XXX MUST GET THIS WORKING
+ internal/cairo-render-context.cpp
+ internal/cairo-renderer.cpp
internal/cairo-renderer-pdf-out.cpp
internal/emf-win32-inout.cpp
internal/emf-win32-print.cpp
@@ -42,7 +42,7 @@ set(extension_SRC
internal/gimpgrad.cpp
internal/grid.cpp
internal/latex-pstricks.cpp
- # internal/latex-pstricks-out.cpp # XXX MUST GET THIS WORKING
+ internal/latex-pstricks-out.cpp
internal/odf.cpp
internal/latex-text-renderer.cpp
internal/pdf-input-cairo.cpp
@@ -115,4 +115,5 @@ if(WIN32)
)
endif()
-add_library(extension_LIB ${extension_SRC})
+# add_library(extension_LIB ${extension_SRC})
+add_inkscape_source("${extension_SRC}")
diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt
index ed64fe764..8016553c8 100644
--- a/src/filters/CMakeLists.txt
+++ b/src/filters/CMakeLists.txt
@@ -22,4 +22,5 @@ set(filters_SRC
turbulence.cpp
)
-add_library(filters_LIB ${filters_SRC})
+#add_library(filters_LIB ${filters_SRC})
+add_inkscape_source("${filters_SRC}")
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index 3f1567cce..b4786ff54 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -27,4 +27,5 @@ set(helper_SRC
${sp_marshal_SRC}
)
-add_library(helper_LIB ${helper_SRC})
+# add_library(helper_LIB ${helper_SRC})
+add_inkscape_source("${helper_SRC}")
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 06a5f869a..e9bff2bc2 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -13,4 +13,5 @@ set(io_SRC
xsltstream.cpp
)
-add_library(io_LIB ${io_SRC})
+# add_library(io_LIB ${io_SRC})
+add_inkscape_source("${io_SRC}")
diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
index 2e1ef311b..62de25d70 100644
--- a/src/jabber_whiteboard/CMakeLists.txt
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -19,4 +19,5 @@ set(jabber_whiteboard_SRC
dialog/choose-desktop.cpp
)
-add_library(jabber_whiteboard_LIB ${jabber_whiteboard_SRC})
+# add_library(jabber_whiteboard_LIB ${jabber_whiteboard_SRC})
+add_inkscape_source("${jabber_whiteboard_SRC}")
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 6895e4dbd..0d3202636 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(libnr_SRC
+set(nr_SRC
#in-svg-plane-test.cpp
nr-blit.cpp
nr-compose.cpp
@@ -33,4 +33,4 @@ set(libnr_SRC
#testnr.cpp
)
-add_library(nr_LIB ${libnr_SRC})
+add_library(nr_LIB ${nr_SRC})
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 069b68bd3..d5f9b846f 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(libnrtype_SRC
+set(nrtype_SRC
FontFactory.cpp
FontInstance.cpp
font-lister.cpp
@@ -16,4 +16,4 @@ set(libnrtype_SRC
TextWrapper.cpp
)
-add_library(nrtype_LIB ${libnrtype_SRC})
+add_library(nrtype_LIB ${nrtype_SRC})
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 51f8d957c..148ea92f7 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -54,4 +54,5 @@ set(live_effects_SRC
parameter/vector.cpp
)
-add_library(live_effects_LIB ${live_effects_SRC})
+# add_library(live_effects_LIB ${live_effects_SRC})
+add_inkscape_source("${live_effects_SRC}")
diff --git a/src/pedro/CMakeLists.txt b/src/pedro/CMakeLists.txt
index 8a952f950..7dce5b755 100644
--- a/src/pedro/CMakeLists.txt
+++ b/src/pedro/CMakeLists.txt
@@ -10,4 +10,5 @@ set(pedro_SRC
pedroxmpp.cpp
)
-add_library(pedro_LIB ${pedro_SRC})
+# add_library(pedro_LIB ${pedro_SRC})
+add_inkscape_source("${pedro_SRC}")
diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 1d96f5ac7..8c1f0058e 100644
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -15,4 +15,5 @@ set(svg_SRC
#test-stubs.cpp
)
-add_library(svg_LIB ${svg_SRC})
+# add_library(svg_LIB ${svg_SRC})
+add_inkscape_source("${svg_SRC}")
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 84aab77e2..3f712a314 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -16,4 +16,5 @@ set(trace_SRC
potrace/trace.cpp
)
-add_library(trace_LIB ${trace_SRC})
+# add_library(trace_LIB ${trace_SRC})
+add_inkscape_source("${trace_SRC}")
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 7c0f18a65..bf9ddb4c8 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -117,12 +117,5 @@ if(WIN32)
)
endif()
-include_directories(
- "${CMAKE_SOURCE_DIR}/src"
- "${CMAKE_SOURCE_DIR}"
- "${CMAKE_SOURCE_DIR}/bind/javainc"
- "${CMAKE_SOURCE_DIR}/bind/javainc/linux"
- "${CMAKE_SOURCE_DIR}/extension/dbus"
-)
-
-add_library(ui_LIB ${ui_SRC})
+# add_library(ui_LIB ${ui_SRC})
+add_inkscape_source("${ui_SRC}")
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index a5aed5be2..ca90272ae 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -7,4 +7,5 @@ set(util_SRC
units.cpp
)
-add_library(util_LIB ${util_SRC})
+# add_library(util_LIB ${util_SRC})
+add_inkscape_source("${util_SRC}")
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index c4f820e52..09d2d6303 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -36,4 +36,5 @@ set(widgets_SRC
toolbox.cpp
)
-add_library(widgets_LIB ${widgets_SRC})
+# add_library(widgets_LIB ${widgets_SRC})
+add_inkscape_source("${widgets_SRC}")
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 353c96998..3cca53fd8 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -18,4 +18,5 @@ set(xml_SRC
rebase-hrefs.cpp
)
-add_library(xml_LIB ${xml_SRC})
+# add_library(xml_LIB ${xml_SRC})
+add_inkscape_source("${xml_SRC}")
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 01:58:58 +0000