diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 062d4b6b1b5e96e052eab14094320c44e51b148e..f03f22c803e237af7efb463905adfdc684ad7874 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
sp-skeleton.cpp\r
sp-spiral.cpp\r
sp-star.cpp\r
+sp-stop.cpp\r
sp-string.cpp\r
sp-style-elem.cpp\r
sp-switch.cpp\r
common-context.cpp\r
conditions.cpp\r
conn-avoid-ref.cpp\r
+connection-points.cpp\r
connector-context.cpp\r
console-output-undo-observer.cpp\r
context-fns.cpp\r
#deptool.cpp\r
-desktop-affine.cpp\r
desktop.cpp\r
desktop-events.cpp\r
desktop-handles.cpp\r
)\r
# All folders for internal inkscape\r
SET(internalfolders\r
-algorithms\r
-api\r
-application\r
+#algorithms\r
+#api\r
bind\r
debug\r
dialogs\r
removeoverlap\r
svg\r
trace\r
-traits\r
+#traits\r
ui\r
util\r
widgets\r
xml\r
+2geom\r
)\r
-\r
-FOREACH(srclistsrc ${internalfolders})\r
- ADD_SUBDIRECTORY(${srclistsrc})\r
-ENDFOREACH(srclistsrc)\r
-\r
-SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})\r
-# All directories containing lists files that describe building internal libraries\r
SET(libfolders\r
-2geom\r
+# Directories containing lists files that describe building internal libraries\r
libavoid\r
libcola\r
libcroco\r
livarot\r
)\r
\r
-FOREACH(dirlistsrc ${libfolders})\r
- ADD_SUBDIRECTORY(${dirlistsrc})\r
-ENDFOREACH(dirlistsrc)\r
+SET(dirs ${internalfolders} ${libfolders}\r
+)\r
+\r
+FOREACH(srclistsrc ${dirs})\r
+ ADD_SUBDIRECTORY(${srclistsrc})\r
+ENDFOREACH(srclistsrc)\r
+\r
+SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})\r
\r
-message(status "${INKSCAPE_LIBS}")\r
ADD_LIBRARY(sp STATIC ${SP_SRC})\r
-TARGET_LINK_LIBRARIES(sp \r
- 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
+TARGET_LINK_LIBRARIES(sp\r
+nr nrtype avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}\r
)\r
# make executable for INKSCAPE\r
ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
TARGET_LINK_LIBRARIES(inkscape\r
- 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}\r
+nr nrtype sp avoid cola croco gdl vpsc livarot ${internalfolders} ${INKSCAPE_LIBS}\r
)\r
\r
# make executable for INKVIEW\r
#ADD_EXECUTABLE(inkview inkview.cpp)\r
#TARGET_LINK_LIBRARIES(inkview\r
-# "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}\r
+# 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}\r
#)\r
\r