[kgraphviewer-devel] extragear/graphics/kgraphviewer

[Milian Wolff]

SVN commit 1147335 by mwolff:

more tries at fixing the build *sigh*

 M  +2 -2      CMakeLists.txt  
 M  +7 -1      cmake/FindGraphViz.cmake  


--- trunk/extragear/graphics/kgraphviewer/CMakeLists.txt #1147334:1147335
@@ -1,6 +1,6 @@
 project(kgraphviewer)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PATH})
 
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
@@ -17,7 +17,7 @@
 find_package(GraphViz REQUIRED)
 
 if(NOT DOT)
-   MESSAGE(STATUS "GraphViz not found. You will need it at runtime")
+   MESSAGE(STATUS "dot executable from GraphViz not found. You will need it at runtime")
 endif(NOT DOT)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
--- trunk/extragear/graphics/kgraphviewer/cmake/FindGraphViz.cmake #1147334:1147335
@@ -20,6 +20,11 @@
 # 
 # For more information, contact the authors of this software at
 # moab at sandia.gov.
+# 
+# this will set the following variables:
+# graphviz_LIBRARIES
+# graphviz_FOUND
+# graphviz_INCLUDE_DIRECTORIES
 
 if ( NOT WIN32 )
   
@@ -37,6 +42,7 @@
     ${graphviz_INCLUDE_DIRS}
     /usr/local/include
     /usr/include
+    PATH_SUFFIXES graphviz
     )
     
 find_library( graphviz_GVC_LIBRARY
@@ -156,4 +162,4 @@
 
 # handle the QUIETLY and REQUIRED arguments and set GRAPHVIZ_FOUND to TRUE if 
 # all listed variables are TRUE
-find_package_handle_standard_args(GraphViz DEFAULT_MSG GRAPHVIZ_LIBRARIES GRAPHVIZ_INCLUDE_DIR)
\ No newline at end of file
+find_package_handle_standard_args(GraphViz DEFAULT_MSG graphviz_LIBRARIES graphviz_INCLUDE_DIRECTORIES)
\ No newline at end of file