diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-05-03 02:35:32 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-05-03 02:35:32 +0000 |
| commit | fc259d9392a7569098c871d9aa5efe7b3fe66219 (patch) | |
| tree | c6de3a960872f886f1774a8ace934aaa7d122e6d /CMakeScripts | |
| parent | make more messages immediate (diff) | |
| download | inkscape-fc259d9392a7569098c871d9aa5efe7b3fe66219.tar.gz inkscape-fc259d9392a7569098c871d9aa5efe7b3fe66219.zip | |
Cmake: Fix some double linking flags
(bzr r5584)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigInkscapeDepends.cmake | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake index bd2edfc48..450bc1fb7 100644 --- a/CMakeScripts/ConfigInkscapeDepends.cmake +++ b/CMakeScripts/ConfigInkscapeDepends.cmake @@ -1,14 +1,16 @@ SET(INKSCAPE_DEPENDS
- gtk+-2.0
- gtkmm-2.4
- cairo
- cairomm-1.0
+# the commented out below are required but pulled in with gtk+-2.0 & gtkmm-2.4 +# with some duplication that we can only remove if lookup each sub-lib individaully
+# cairo
+# cairomm-1.0
+# glib-2.0 +# glibmm-2.4 + gtk+-2.0 + gtkmm-2.4 sigc++-2.0
lcms
libgc1c2
libpng
- glib-2.0
- glibmm-2.4
libxml-2.0
libxslt
ImageMagick++
@@ -45,8 +47,9 @@ FOREACH(dep ${INKSCAPE_DEPENDS}) SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")
ELSE("${dep}_FOUND")
message(STATUS "${dep}: NOT FOUND")
- ENDIF("${dep}_FOUND")
-ENDFOREACH(dep)
+ ENDIF("${dep}_FOUND") +ENDFOREACH(dep) +
# Include non pkg-config dependencies:
INCLUDE(FindBoost)
INCLUDE(FindGC)
@@ -146,9 +149,4 @@ ENDIF(HAVE_CAIRO_PDF) # Create the two configuration files: config.h and inkscape_version.h
# Create them in the binary root dir
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
-FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")
- -#Linking check -message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") -message(STATUS "${INKSCAPE_LINK_FLAGS}") -message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") +FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n") |