From: ellson Date: Mon, 10 Jul 2006 11:13:44 +0000 (+0000) Subject: cmake stuff X-Git-Tag: LAST_LIBGRAPH~32^2~6087 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98c8284376398cdd697f955ef6f3cbc9eae5c164;p=graphviz cmake stuff --- diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt index 681419019..67285716c 100644 --- a/lib/pathplan/CMakeLists.txt +++ b/lib/pathplan/CMakeLists.txt @@ -10,6 +10,7 @@ INCLUDE(SRCDIRs) INCLUDE(${pathplan_SRCDIR}/sources.cmake) ADD_LIBRARY(pathplan STATIC ${pathplan_SRCS}) +ADD_LIBRARY(pathplan SHARED ${pathplan_SRCS}) INSTALL_FILES(FILES pathplan.pdf diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt index a522fc7e1..f21a2f2d3 100644 --- a/plugin/core/CMakeLists.txt +++ b/plugin/core/CMakeLists.txt @@ -3,6 +3,5 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_core_SRCDIR}/sources.cmake) +ADD_LIBRARY(gvplugin_core STATIC ${gvplugin_core_SRCS}) ADD_LIBRARY(gvplugin_core MODULE ${gvplugin_core_SRCS}) - -ADD_LIBRARY(gvplugin_core_static STATIC ${gvplugin_core_SRCS}) diff --git a/plugin/dot_layout/CMakeLists.txt b/plugin/dot_layout/CMakeLists.txt index 510688e10..dde054407 100644 --- a/plugin/dot_layout/CMakeLists.txt +++ b/plugin/dot_layout/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_dot_layout_SRCDIR}/sources.cmake) +INCLUDE(${dotgen_SRCDIR}/sources.cmake) -ADD_LIBRARY(gvplugin_dot_layout MODULE ${gvplugin_dot_layout_SRCS}) - -ADD_LIBRARY(gvplugin_dot_layout_static STATIC ${gvplugin_dot_layout_SRCS}) +ADD_LIBRARY(gvplugin_dot_layout STATIC ${gvplugin_dot_layout_SRCS}) +ADD_LIBRARY(gvplugin_dot_layout MODULE ${gvplugin_dot_layout_SRCS} ${dotgen_SRCS}) diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt index 5be4b1843..a6c7e5cf7 100644 --- a/plugin/gd/CMakeLists.txt +++ b/plugin/gd/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_gd_SRCDIR}/sources.cmake) +INCLUDE(${gd_SRCDIR}/sources.cmake) -ADD_LIBRARY(gvplugin_gd MODULE ${gvplugin_gd_SRCS}) - -ADD_LIBRARY(gvplugin_gd_static STATIC ${gvplugin_gd_SRCS}) +ADD_LIBRARY(gvplugin_gd STATIC ${gvplugin_gd_SRCS}) +ADD_LIBRARY(gvplugin_gd MODULE ${gvplugin_gd_SRCS} ${gd_SRCS}) diff --git a/plugin/gtk/CMakeLists.txt b/plugin/gtk/CMakeLists.txt index 80aadaf3c..ad4008e92 100644 --- a/plugin/gtk/CMakeLists.txt +++ b/plugin/gtk/CMakeLists.txt @@ -3,6 +3,5 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_gtk_SRCDIR}/sources.cmake) +ADD_LIBRARY(gvplugin_gtk STATIC ${gvplugin_gtk_SRCS}) ADD_LIBRARY(gvplugin_gtk MODULE ${gvplugin_gtk_SRCS}) - -ADD_LIBRARY(gvplugin_gtk_static STATIC ${gvplugin_gtk_SRCS}) diff --git a/plugin/neato_layout/CMakeLists.txt b/plugin/neato_layout/CMakeLists.txt index 9c8b655c3..62c9affde 100644 --- a/plugin/neato_layout/CMakeLists.txt +++ b/plugin/neato_layout/CMakeLists.txt @@ -2,7 +2,16 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_neato_layout_SRCDIR}/sources.cmake) +INCLUDE(${neatogen_SRCDIR}/sources.cmake) +INCLUDE(${circogen_SRCDIR}/sources.cmake) +INCLUDE(${twopigen_SRCDIR}/sources.cmake) +INCLUDE(${fdpgen_SRCDIR}/sources.cmake) -ADD_LIBRARY(gvplugin_neato_layout MODULE ${gvplugin_neato_layout_SRCS}) - -ADD_LIBRARY(gvplugin_neato_layout_static STATIC ${gvplugin_neato_layout_SRCS}) +ADD_LIBRARY(gvplugin_neato_layout STATIC ${gvplugin_neato_layout_SRCS}) +ADD_LIBRARY(gvplugin_neato_layout MODULE + ${gvplugin_neato_layout_SRCS} + ${neatogen_SRCS} + ${circogen_SRCS} + ${twopigen_SRCS} + ${fdpgen_SRCS} +) diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt index 1a6fa2da5..271bb186a 100644 --- a/plugin/pango/CMakeLists.txt +++ b/plugin/pango/CMakeLists.txt @@ -3,6 +3,5 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_pango_SRCDIR}/sources.cmake) +ADD_LIBRARY(gvplugin_pango STATIC ${gvplugin_pango_SRCS}) ADD_LIBRARY(gvplugin_pango MODULE ${gvplugin_pango_SRCS}) - -ADD_LIBRARY(gvplugin_pango_static STATIC ${gvplugin_pango_SRCS}) diff --git a/plugin/xlib/CMakeLists.txt b/plugin/xlib/CMakeLists.txt index 9bf1135aa..3251d4399 100644 --- a/plugin/xlib/CMakeLists.txt +++ b/plugin/xlib/CMakeLists.txt @@ -3,6 +3,5 @@ INCLUDE(SRCDIRs) INCLUDE(${gvplugin_xlib_SRCDIR}/sources.cmake) +ADD_LIBRARY(gvplugin_xlib STATIC ${gvplugin_xlib_SRCS}) ADD_LIBRARY(gvplugin_xlib MODULE ${gvplugin_xlib_SRCS}) - -ADD_LIBRARY(gvplugin_xlib_static STATIC ${gvplugin_xlib_SRCS}) diff --git a/tclpkg/CMakeLists.txt b/tclpkg/CMakeLists.txt index 6a1fe6cb0..3d235c93e 100644 --- a/tclpkg/CMakeLists.txt +++ b/tclpkg/CMakeLists.txt @@ -1,5 +1,4 @@ # $Id$ $Revision$ -## Process this file with cmake to produce Makefile SUBDIRS( tclstubs