[kgraphviewer-devel] [KGraphViewer/libkgraphviz] c75cf7e: Do not depend on graphviz in KGraphViewer

[Kevin Funk]

commit c75cf7edb6c23cd910b9ab579520b0e4d4de007e
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Mon Dec 20 14:37:51 2010 +0100

    Do not depend on graphviz in KGraphViewer
    
    Changes:
    * Depend on kgraphviz (which depends on graphviz)
    * CMakeLists cleanup (remove redundant link targets)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ea72df..62bd826 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(kgraphviz)
 add_subdirectory(part)
 add_subdirectory(shared)
 
-include_directories( part ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${graphviz_INCLUDE_DIRECTORIES} )
+include_directories( part ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 
 ########### kgraphviewer target ###############
@@ -58,7 +58,3 @@ install( TARGETS kgrapheditor ${INSTALL_TARGETS_DEFAULT_ARGS})
 install( FILES kgrapheditorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES kgrapheditorui.rc DESTINATION ${DATA_INSTALL_DIR}/kgrapheditor )
 install( FILES kgrapheditor.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-
-
-
-#add_subdirectory(plasmaapplet)
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
index 50bdfa9..9042d5f 100644
--- a/src/part/CMakeLists.txt
+++ b/src/part/CMakeLists.txt
@@ -1,8 +1,12 @@
-include_directories( ../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${graphviz_INCLUDE_DIRECTORIES} )
+include_directories(
+  ../
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 link_directories(
-    ${CMAKE_BINARY_DIR}/lib
-    ${LIB_INSTALL_DIR}
+  ${CMAKE_BINARY_DIR}/lib
+  ${LIB_INSTALL_DIR}
 )
 
 ########### next target ###############
@@ -20,7 +24,7 @@ kde4_add_library(kgraphviewerlib SHARED ${kgraphviewerlib_LIB_SRCS})
 add_dependencies(kgraphviewerlib kgraphviz)
 
 add_definitions(-DQT_STL)
-target_link_libraries(kgraphviewerlib ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KWALLETCLIENT_LIBS} ${KDE4_KDESU_LIBS} ${graphviz_LIBRARIES} kgraphviz)
+target_link_libraries(kgraphviewerlib ${KDE4_KDE3SUPPORT_LIBS} ${graphviz_LIBRARIES} kgraphviz)
 
 set_target_properties(kgraphviewerlib PROPERTIES VERSION 2.1 SOVERSION 3 OUTPUT_NAME kgraphviewer )
 
@@ -34,7 +38,7 @@ set( kgraphviewerpart_PART_SRCS kgraphviewer_part.cpp  )
 kde4_add_plugin(kgraphviewerpart ${kgraphviewerpart_PART_SRCS})
 
 add_definitions(-DQT_STL)
-target_link_libraries(kgraphviewerpart ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KWALLETCLIENT_LIBS} ${KDE4_KDESU_LIBS} gvc graph pathplan cdt kgraphviewerlib kgraphviz)
+target_link_libraries(kgraphviewerpart ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} kgraphviewerlib kgraphviz)
 
 install( TARGETS kgraphviewerpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
diff --git a/src/part/kgraphviewer_part.cpp b/src/part/kgraphviewer_part.cpp
index d01edfc..0429e34 100644
--- a/src/part/kgraphviewer_part.cpp
+++ b/src/part/kgraphviewer_part.cpp
@@ -36,8 +36,6 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 
-#include <graphviz/gvc.h>
-
 #include <iostream>
 
 // #include "kgraphviewersettings.h"
@@ -448,7 +446,6 @@ KGraphViewerPartFactory::KGraphViewerPartFactory(QObject* parent)
 
 KGraphViewerPartFactory::~KGraphViewerPartFactory()
 {
-gvFreeContext(gvContext());
 delete s_about;
 }