diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2009-01-09 20:22:29 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2009-01-09 20:22:29 +0000 |
| commit | 849dc2bfbec4ae140a986b7a5d645522c662fb81 (patch) | |
| tree | 5be0b1a6787aa4ebd44cb6271fa732fbd15179d2 /src | |
| parent | * [INTL: zh_TW] update by Wei-Lun Chao (diff) | |
| download | inkscape-849dc2bfbec4ae140a986b7a5d645522c662fb81.tar.gz inkscape-849dc2bfbec4ae140a986b7a5d645522c662fb81.zip | |
Cmake: New FindGTK2
(bzr r7103)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 29 |
1 files changed, 13 insertions, 16 deletions
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
|