[kgraphviewer-devel] extragear/graphics/kgraphviewer

[Milian Wolff]

SVN commit 1147139 by mwolff:

properly check for graphviz header files

 M  +4 -4      CMakeLists.txt  
 A             cmake (directory)  
 A             cmake/FindGraphViz.cmake  
 M  +1 -1      src/part/CMakeLists.txt  


--- trunk/extragear/graphics/kgraphviewer/CMakeLists.txt #1147138:1147139
@@ -1,6 +1,6 @@
 project(kgraphviewer)
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/)
 
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
@@ -14,11 +14,11 @@
 endif (APPLE)
 
 find_package(Boost 1.36 REQUIRED)
+find_package(GraphViz REQUIRED)
 
-FIND_PROGRAM(DOT_EXECUTABLE NAMES dot  PATHS /usr/bin/  )
-if(NOT DOT_EXECUTABLE)
+if(NOT GRAPHVIZ_DOT_EXECUTABLE)
    MESSAGE(STATUS "GraphViz not found. You will need it at runtime")
-endif(NOT DOT_EXECUTABLE)
+endif(NOT GRAPHVIZ_DOT_EXECUTABLE)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 
--- trunk/extragear/graphics/kgraphviewer/src/part/CMakeLists.txt #1147138:1147139
@@ -16,7 +16,7 @@
 kde4_add_library(kgraphviewerlib SHARED ${kgraphviewerlib_LIB_SRCS})
 
 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} gvc graph pathplan cdt)
+target_link_libraries(kgraphviewerlib  ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KWALLETCLIENT_LIBS} ${KDE4_KDESU_LIBS} ${GRAPHVIZ_LIBRARIES})
 
 set_target_properties(kgraphviewerlib PROPERTIES VERSION 2.0.3
                                           SOVERSION 2 )