[kgraphviewer-devel] [KGraphViewer] 8b3d14f: Fix CMake for non-default graphviz location

[Kevin Funk]

commit 8b3d14fb3247596451c5f2238025ed1c03d2400b
branch master
Author: Kevin Funk <krf at electrostorm.net>
Date:   Wed Dec 8 09:55:23 2010 +0100

    Fix CMake for non-default graphviz location
    
    Make compile if graphviz is not installed in default locations, e.g.
    user space.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13c7087..3359d15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,13 @@ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
 
 remove_definitions(-DQT_NO_STL) 
 
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-
+include_directories(
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+    ${KDE4_INCLUDES}
+    ${graphviz_INCLUDE_DIRECTORIES}
+    ${INCLUDE_INSTALL_DIR}
+)
 
 configure_file (config-kgraphviewer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kgraphviewer.h )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88b824e..0863ee2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory( part )
 
-include_directories( part ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories( part ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${graphviz_INCLUDE_DIRECTORIES} )
 
 
 ########### kgraphviewer target ###############
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
index ed6b62c..3375063 100644
--- a/src/part/CMakeLists.txt
+++ b/src/part/CMakeLists.txt
@@ -1,6 +1,9 @@
 include_directories( ../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${graphviz_INCLUDE_DIRECTORIES} )
 
-link_directories(${CMAKE_BINARY_DIR}/lib)
+link_directories(
+    ${CMAKE_BINARY_DIR}/lib
+    ${LIB_INSTALL_DIR}
+)
 
 ########### next target ###############