From 20e2b77b5ec3e16afda325101a664b8136d7fb62 Mon Sep 17 00:00:00 2001 From: verbalshadow Date: Sat, 3 May 2008 02:35:32 +0000 Subject: [PATCH] Cmake: Fix some double linking flags --- CMakeLists.txt | 6 +- CMakeScripts/ConfigInkscapeDepends.cmake | 26 +++--- src/CMakeLists.txt | 8 +- src/extension/internal/CMakeLists.txt | 31 +++++- src/libcroco/CMakeLists.txt | 114 +++++++++++------------ 5 files changed, 107 insertions(+), 78 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5af631808..c911d2fc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ SET(CMAKE_VERBOSE_MAKEFILE OFF) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts) INCLUDE(ConfigPaths) -INCLUDE(ConfigCompileFlags) INCLUDE(ConfigInkscapeDepends) +INCLUDE(ConfigCompileFlags) #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") #IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2") @@ -51,3 +51,7 @@ po FOREACH(dirlist ${folders}) ADD_SUBDIRECTORY(${dirlist}) ENDFOREACH(dirlist) + +message(STATUS "3XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") +message(STATUS "${INKSCAPE_LINK_FLAGS}") +message(STATUS "3XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") 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") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4984daa17..6e446b284 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -611,8 +611,8 @@ TARGET_LINK_LIBRARIES(inkscape ) # 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 -) +#ADD_EXECUTABLE(inkview inkview.cpp) +#TARGET_LINK_LIBRARIES(inkview +# "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot +#) diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt index 1ed68269a..3d69be2b1 100644 --- a/src/extension/internal/CMakeLists.txt +++ b/src/extension/internal/CMakeLists.txt @@ -1,32 +1,59 @@ IF(WIN32) SET(EXT_INT_WIN -win32.cpp) +win32.cpp +win32.h) ENDIF(WIN32) SET(extension_internal_SRC bluredge.cpp +bluredge.h cairo-pdf-out.cpp +cairo-pdf-out.h cairo-png-out.cpp +cairo-png-out.h cairo-ps-out.cpp +cairo-ps-out.h cairo-render-context.cpp +cairo-render-context.h cairo-renderer.cpp +cairo-renderer.h cairo-renderer-pdf-out.cpp +cairo-renderer-pdf-out.h +clear-n_.h emf-win32-inout.cpp +emf-win32-inout.h emf-win32-print.cpp +emf-win32-print.h eps-out.cpp +eps-out.h gdkpixbuf-input.cpp +gdkpixbuf-input.h gimpgrad.cpp +gimpgrad.h grid.cpp +grid.h latex-pstricks.cpp +latex-pstricks.h latex-pstricks-out.cpp +latex-pstricks-out.h odf.cpp +odf.h pdf-cairo.cpp +pdf-cairo.h +pdfinput pdf-input-cairo.cpp +pdf-input-cairo.h pov-out.cpp +pov-out.h ps.cpp +ps.h ps-out.cpp +ps-out.h svg.cpp +svg.h svgz.cpp -${EXT_INT_WIN} +svgz.h wpg-input.cpp +wpg-input.h +${EXT_INT_WIN} ) diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt index 8d2d54a22..60a839bf9 100644 --- a/src/libcroco/CMakeLists.txt +++ b/src/libcroco/CMakeLists.txt @@ -1,59 +1,59 @@ -SET(libcroco_SRC -cr-additional-sel.c -cr-additional-sel.h -cr-attr-sel.c -cr-attr-sel.h -cr-cascade.c -cr-cascade.h -cr-declaration.c -cr-declaration.h -cr-doc-handler.c -cr-doc-handler.h -cr-enc-handler.c -cr-enc-handler.h -cr-fonts.c -cr-fonts.h -cr-input.c -cr-input.h -cr-libxml-node-iface.c -cr-libxml-node-iface.h -cr-node-iface.h -cr-num.c -cr-num.h -cr-om-parser.c -cr-om-parser.h -cr-parser.c -cr-parser.h -cr-parsing-location.c -cr-parsing-location.h -cr-prop-list.c -cr-prop-list.h -cr-pseudo.c -cr-pseudo.h -cr-rgb.c -cr-rgb.h -cr-selector.c -cr-selector.h -cr-sel-eng.c -cr-sel-eng.h -cr-simple-sel.c -cr-simple-sel.h -cr-statement.c -cr-statement.h -cr-string.c -cr-string.h -cr-style.c -cr-style.h -cr-stylesheet.c -cr-stylesheet.h -cr-term.c -cr-term.h -cr-tknzr.c -cr-tknzr.h -cr-token.c -cr-token.h -cr-utils.c -cr-utils.h -libcroco.h +SET(libcroco_SRC +cr-additional-sel.c +cr-additional-sel.h +cr-attr-sel.c +cr-attr-sel.h +cr-cascade.c +cr-cascade.h +cr-declaration.c +cr-declaration.h +cr-doc-handler.c +cr-doc-handler.h +cr-enc-handler.c +cr-enc-handler.h +cr-fonts.c +cr-fonts.h +cr-input.c +cr-input.h +cr-libxml-node-iface.c +cr-libxml-node-iface.h +cr-node-iface.h +cr-num.c +cr-num.h +cr-om-parser.c +cr-om-parser.h +cr-parser.c +cr-parser.h +cr-parsing-location.c +cr-parsing-location.h +cr-prop-list.c +cr-prop-list.h +cr-pseudo.c +cr-pseudo.h +cr-rgb.c +cr-rgb.h +cr-selector.c +cr-selector.h +cr-sel-eng.c +cr-sel-eng.h +cr-simple-sel.c +cr-simple-sel.h +cr-statement.c +cr-statement.h +cr-string.c +cr-string.h +cr-style.c +cr-style.h +cr-stylesheet.c +cr-stylesheet.h +cr-term.c +cr-term.h +cr-tknzr.c +cr-tknzr.h +cr-token.c +cr-token.h +cr-utils.c +cr-utils.h +libcroco.h ) ADD_LIBRARY(croco STATIC ${libcroco_SRC}) -- 2.30.2