cmake stuff

diff --git a/lib/pathplan/CMakeLists.txt b/lib/pathplan/CMakeLists.txt
index 681419019315c2e8943bb1766f692bac588e7fcb..67285716c3f734f5b1488c3f289a458bbc070862 100644 (file)
--- 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 a522fc7e1444034acdd8308d5a7bf2d6e2866510..f21a2f2d3a2fb5966c8596b08c06dc7f5113ae6b 100644 (file)
--- 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 510688e100aee94f4b74325bdf37b8dc92c6724e..dde054407831af69edbdc57ddef78adc7899cb86 100644 (file)
--- 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 5be4b18435e9a4da0ef2d4fd04a6adca6c2d5766..a6c7e5cf75a72eaf499fcceb8596fe16c15152d6 100644 (file)
--- 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 80aadaf3c63b0c736e7f2c1cf5397f5af42decd7..ad4008e927b1ef4dff0cf3e7cbc0a7de59407bcb 100644 (file)
--- 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 9c8b655c3768cdae07016e3251a6b54a0d0ee845..62c9affde2a74719116ff4ec6cdfe6943bbc05b2 100644 (file)
--- 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 1a6fa2da579e07a27a2f9b8a41fac89f1e0e71b6..271bb186aebde49103ce867a3cf62f575b1155a6 100644 (file)
--- 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 9bf1135aa573cf2989b0beb294c9a9619829b2a6..3251d439997c43060f9ec5d0c4e1bb925b15c713 100644 (file)
--- 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 6a1fe6cb0bd185bb1fcb20b17e6bdc161db75bad..3d235c93e16179b42a1f85be1994dd169383ebaf 100644 (file)
--- a/tclpkg/CMakeLists.txt
+++ b/tclpkg/CMakeLists.txt
@@ -1,5 +1,4 @@
 # $Id$ $Revision$
-## Process this file with cmake to produce Makefile
 
 SUBDIRS(
        tclstubs