From: ellson <devnull@localhost>
Date: Sun, 9 Jul 2006 04:29:50 +0000 (+0000)
Subject: cmake stuff
X-Git-Tag: LAST_LIBGRAPH~32^2~6093
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aafb50a5df9afe338103a385859b31bb4089e44d;p=graphviz

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 fe5fb020b..a1f5af6f4 100644
--- 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 66424b80a..a522fc7e1 100644
--- 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 cb0e71f1b..510688e10 100644
--- 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 ec0d09f48..5be4b1843 100644
--- 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 7d1513237..80aadaf3c 100644
--- 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 913b285e1..9c8b655c3 100644
--- 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 12f25b9e0..1a6fa2da5 100644
--- 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 4298f9390..9bf1135aa 100644
--- 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 d300b54b3..72f343800 100644
--- 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