From 849dc2bfbec4ae140a986b7a5d645522c662fb81 Mon Sep 17 00:00:00 2001
From: "Joshua L. Blocher" <verbalshadow@gmail.com>
Date: Fri, 9 Jan 2009 20:22:29 +0000
Subject: Cmake: New FindGTK2

(bzr r7103)
---
 src/CMakeLists.txt | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e30df661e..9f7cc33dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -228,16 +228,10 @@ ui
 util
 widgets
 xml
+2geom
 )
-
-FOREACH(srclistsrc ${internalfolders})
-  ADD_SUBDIRECTORY(${srclistsrc})
-ENDFOREACH(srclistsrc)
-
-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
@@ -248,19 +242,22 @@ libvpsc
 livarot
 )
 
-FOREACH(dirlistsrc ${libfolders})
-  ADD_SUBDIRECTORY(${dirlistsrc})
-ENDFOREACH(dirlistsrc)
+SET(dirs ${internalfolders} ${libfolders}
+)
 
-message(status "${INKSCAPE_LIBS}")
+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
-)
+
 # make executable for INKSCAPE
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})
 TARGET_LINK_LIBRARIES(inkscape
-	 2geom avoid cola croco gdl nr nrtype vpsc livarot sp ${internalfolders}
+    ${internalfolders} sp avoid cola croco gdl nr nrtype vpsc livarot ${INKSCAPE_LIBS}
 )
 
 # make executable for INKVIEW
-- 
cgit v1.2.3