cmake stuff

diff --git a/cmake/directories.cmake b/cmake/SRCDIRs.cmake
similarity index 69%
rename from cmake/directories.cmake
rename to cmake/SRCDIRs.cmake
index fe5fb020ba01825d4a9b0523fb3541547312ce37..a1f5af6f4d51846065939e3d8053db36a4c5249f 100644 (file)
--- a/cmake/directories.cmake
+++ b/cmake/SRCDIRs.cmake
@@ -22,10 +22,10 @@ SET(twopigen_SRCDIR ${CMAKE_SOURCE_DIR}/lib/twopigen)
 SET(vmalloc_SRCDIR ${CMAKE_SOURCE_DIR}/lib/vmalloc)
 SET(vpsc_SRCDIR ${CMAKE_SOURCE_DIR}/lib/vpsc)
 
-SET(gvplugin_core_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_core)
-SET(gvplugin_dot_layout_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_dot_layout)
-SET(gvplugin_gd_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_gd)
-SET(gvplugin_gtk_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_gtk)
-SET(gvplugin_neato_layout_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_neato_layout)
-SET(gvplugin_pango_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_pango)
-SET(gvplugin_xlib_SRCDIR ${CMAKE_SOURCE_DIR}/lib/gvplugin_xlib)
+SET(gvplugin_core_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/core)
+SET(gvplugin_dot_layout_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/dot_layout)
+SET(gvplugin_gd_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/gd)
+SET(gvplugin_gtk_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/gtk)
+SET(gvplugin_neato_layout_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/neato_layout)
+SET(gvplugin_pango_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/pango)
+SET(gvplugin_xlib_SRCDIR ${CMAKE_SOURCE_DIR}/plugin/xlib)

diff --git a/plugin/core/CMakeLists.txt b/plugin/core/CMakeLists.txt
index 66424b80a1111933f0fcc14f136368aa50ab22f0..a522fc7e1444034acdd8308d5a7bf2d6e2866510 100644 (file)
--- a/plugin/core/CMakeLists.txt
+++ b/plugin/core/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_core_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_core MODULE ${gvplugin_core_SRCS})

diff --git a/plugin/dot_layout/CMakeLists.txt b/plugin/dot_layout/CMakeLists.txt
index cb0e71f1b100dd277ba215bb196ef5adb00c92bd..510688e100aee94f4b74325bdf37b8dc92c6724e 100644 (file)
--- a/plugin/dot_layout/CMakeLists.txt
+++ b/plugin/dot_layout/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_dot_layout_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_dot_layout MODULE ${gvplugin_dot_layout_SRCS})

diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt
index ec0d09f48130cb9468489941ad20848b293e54f3..5be4b18435e9a4da0ef2d4fd04a6adca6c2d5766 100644 (file)
--- a/plugin/gd/CMakeLists.txt
+++ b/plugin/gd/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_gd_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_gd MODULE ${gvplugin_gd_SRCS})

diff --git a/plugin/gtk/CMakeLists.txt b/plugin/gtk/CMakeLists.txt
index 7d1513237bc67497ade4cc80882766911bb62a0a..80aadaf3c63b0c736e7f2c1cf5397f5af42decd7 100644 (file)
--- a/plugin/gtk/CMakeLists.txt
+++ b/plugin/gtk/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_gtk_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_gtk MODULE ${gvplugin_gtk_SRCS})

diff --git a/plugin/neato_layout/CMakeLists.txt b/plugin/neato_layout/CMakeLists.txt
index 913b285e1c528175e5265d1e560ff25dd3e3981c..9c8b655c3768cdae07016e3251a6b54a0d0ee845 100644 (file)
--- a/plugin/neato_layout/CMakeLists.txt
+++ b/plugin/neato_layout/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_neato_layout_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_neato_layout MODULE ${gvplugin_neato_layout_SRCS})

diff --git a/plugin/pango/CMakeLists.txt b/plugin/pango/CMakeLists.txt
index 12f25b9e03d8be0de7798b3e7d678fb051a905f0..1a6fa2da579e07a27a2f9b8a41fac89f1e0e71b6 100644 (file)
--- a/plugin/pango/CMakeLists.txt
+++ b/plugin/pango/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_pango_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_pango MODULE ${gvplugin_pango_SRCS})

diff --git a/plugin/xlib/CMakeLists.txt b/plugin/xlib/CMakeLists.txt
index 4298f93909c34abb2d8882c015c3788d1302fae0..9bf1135aa573cf2989b0beb294c9a9619829b2a6 100644 (file)
--- a/plugin/xlib/CMakeLists.txt
+++ b/plugin/xlib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$ $Revision$
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(SRCDIRs)
 INCLUDE(${gvplugin_xlib_SRCDIR}/sources.cmake)
 
 ADD_LIBRARY(gvplugin_xlib MODULE ${gvplugin_xlib_SRCS})

diff --git a/plugin/xlib/sources.cmake b/plugin/xlib/sources.cmake
index d300b54b3db6aca2695b0bd3e2c72dafd686ca8f..72f3438002eaac71645e323bd7560ef3f0a47328 100644 (file)
--- a/plugin/xlib/sources.cmake
+++ b/plugin/xlib/sources.cmake
@@ -1,13 +1,19 @@
 # $Id$ $Revision$
 
+INCLUDE( FindX11 )
+INCLUDE( UsePkgConfig )
+PKGCONFIG( gnomeui GNOMEUI_INCLUDE_DIR GNOMEUI_LIB_DIR GNOMEUI_LINK_FLAGS GNOMEUI_CFLAGS )
+PKGCONFIG( pangocairo PANGOCAIRO_INCLUDE_DIR PANGOCAIRO_LIB_DIR PANGOCAIRO_LINK_FLAGS PANGOCAIRO_CFLAGS )
+ADD_DEFINITIONS(${GNOMEUI_CFLAGS} ${PANGOCAIRO_CFLAGS})
+
 INCLUDE_DIRECTORIES(
        ${gvplugin_xlib_SRCDIR}
        ${top_SRCDIR}
        ${common_SRCDIR}
-       ${graph_SRCDIR}
-       ${cdt_SRCDIR}
        ${pathplan_SRCDIR}
        ${gvc_SRCDIR}
+       ${graph_SRCDIR}
+       ${cdt_SRCDIR}
 )
 
 SET(gvplugin_xlib_SRCS