X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=a956f6ad82d847629bbea539f911d48983b18676;hb=f2b0b162d842a21d4c43394fc4e508a399e51fd9;hp=a6a1e2a74a014fa2da259d77a2cc75172299aa3f;hpb=efc5c07f865453ad6b918713af0e18b96c912568;p=inkscape.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a6a1e2a74..a956f6ad8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ IF(WIN32)
 ELSEIF(WIN32)
     SET(ONLY_WIN)
 ENDIF(WIN32)
+
 SET(SP_SRC
 sp-anchor.cpp
 sp-animation.cpp
@@ -15,26 +16,6 @@ sp-conn-end-pair.cpp
 sp-cursor.cpp
 sp-defs.cpp
 sp-ellipse.cpp
-# sp-feblend.cpp
-# sp-fecolormatrix.cpp
-# sp-fecomponenttransfer.cpp
-# sp-fecomponenttransfer-funcnode.cpp
-# sp-fecomposite.cpp
-# sp-feconvolvematrix.cpp
-# sp-fediffuselighting.cpp
-# sp-fedisplacementmap.cpp
-# sp-fedistantlight.cpp
-# sp-feflood.cpp
-# sp-feimage.cpp
-# sp-femerge.cpp
-# sp-femergenode.cpp
-# sp-femorphology.cpp
-# sp-feoffset.cpp
-# sp-fepointlight.cpp
-# sp-fespecularlighting.cpp
-# sp-fespotlight.cpp
-# sp-fetile.cpp
-# sp-feturbulence.cpp
 sp-filter.cpp
 sp-filter-primitive.cpp
 sp-filter-reference.cpp
@@ -80,6 +61,7 @@ sp-shape.cpp
 sp-skeleton.cpp
 sp-spiral.cpp
 sp-star.cpp
+sp-stop.cpp
 sp-string.cpp
 sp-style-elem.cpp
 sp-switch.cpp
@@ -105,11 +87,11 @@ composite-undo-stack-observer.cpp
 common-context.cpp
 conditions.cpp
 conn-avoid-ref.cpp
+connection-points.cpp
 connector-context.cpp
 console-output-undo-observer.cpp
 context-fns.cpp
 #deptool.cpp
-desktop-affine.cpp
 desktop.cpp
 desktop-events.cpp
 desktop-handles.cpp
@@ -220,71 +202,37 @@ version.cpp
 zoom-context.cpp
 ${ONLY_WIN}
 )
-# All folder with CMakeLists.txt files (excluding internal libraries)
-SET(srcfolders
-algorithms
-api
+# All folders for internal inkscape
+SET(internalfolders
+#algorithms
+#api
 application
 bind
 debug
 dialogs
 display
 dom
-dom/io
-dom/odf
-dom/util
-#dom/work
 extension
-#extension/dxf2svg
-extension/implementation
-extension/internal
-extension/internal/bitmap
-extension/internal/filter
-extension/internal/pdfinput
-extension/param
-extension/script
+filters
 graphlayout
 helper
 inkjar
 io
 jabber_whiteboard
-jabber_whiteboard/dialog
 live_effects
-live_effects/parameter
 pedro
 removeoverlap
 svg
 trace
-trace/potrace
-traits
-ui/cache
+#traits
 ui
-ui/dialog
-ui/view
-ui/widget
-#utest
 util
 widgets
 xml
+2geom
 )
-
-# 1) include each list file
-# 2) grab the variable inside 
-# 3) prepend the full relative path to each file in list
-# 4) append the list to INKSCAPE_SRC
-FOREACH(dirlist ${srcfolders})
-  SET(_temp_dirlist "${dirlist}")
-  MESSAGE(STATUS "Processing ${CMAKE_CURRENT_SOURCE_DIR}/${dirlist}/CMakeLists.txt")
-  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/${dirlist}/CMakeLists.txt)
-  SANITIZE_PATH(dirlist)
-  PREPEND(${dirlist}_SRC "${_temp_dirlist}/")
-  SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${${dirlist}_SRC})
-ENDFOREACH(dirlist)
-
-SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})
-# All directories containing lists files that describe building internal libraries
 SET(libfolders
-2geom
+# Directories containing lists files that describe building internal libraries
 libavoid
 libcola
 libcroco
@@ -295,24 +243,28 @@ libvpsc
 livarot
 )
 
-FOREACH(dirlistsrc ${libfolders})
-  ADD_SUBDIRECTORY(${dirlistsrc})
-ENDFOREACH(dirlistsrc)
+SET(dirs ${internalfolders} ${libfolders}
+)
+
+FOREACH(srclistsrc ${dirs})
+  ADD_SUBDIRECTORY(${srclistsrc})
+ENDFOREACH(srclistsrc)
+
+SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})
 
-message(status "${INKSCAPE_LIBS}")
 ADD_LIBRARY(sp STATIC ${SP_SRC})
-TARGET_LINK_LIBRARIES(sp 
-	 2geom avoid cola croco gdl nr nrtype vpsc livarot
+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
-	 2geom avoid cola croco gdl nr nrtype vpsc livarot sp
+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
+#	2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}
 #)