since SP_VERB_XMPP_CLIENT is commented out in .h, it must be commented out here to...

[inkscape.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e30df661ecfe9d22f889329b74417b54d35bbcf8..1885f56e51d89552f707ea120b687bff432f4383 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,7 +90,6 @@ connector-context.cpp
 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
@@ -228,16 +227,10 @@ ui
 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
@@ -248,24 +241,28 @@ libvpsc
 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