From 12a484593c2802aed4bc6836de138b006a3d31f8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Jan 2009 16:37:38 +0000
Subject: [PATCH] Further tweak to include paths

---
 CMakeModules/FindOurDCMTK.cmake            | 8 ++++++++
 src/osgPlugins/dicom/CMakeLists.txt        | 2 +-
 src/osgPlugins/dicom/ReaderWriterDICOM.cpp | 8 ++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CMakeModules/FindOurDCMTK.cmake b/CMakeModules/FindOurDCMTK.cmake
index 760772af9..918c164b7 100644
--- a/CMakeModules/FindOurDCMTK.cmake
+++ b/CMakeModules/FindOurDCMTK.cmake
@@ -14,6 +14,14 @@
 # Written for VXL by Amitha Perera.
 # Modified by Robert Osfied to enable support for install placements of DCMTK 3.5.4 versions onwards
 
+FIND_PATH( DCMTK_ROOT_INCLUDE_DIR dcmtk/config/osconfig.h
+    ${DCMTK_DIR}/config/include 
+    ${DCMTK_DIR}/include
+    /usr/local/include/
+    /usr/include/
+    /usr/local/dicom/include/
+)
+
 FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
     ${DCMTK_DIR}/config/include 
     ${DCMTK_DIR}/include
diff --git a/src/osgPlugins/dicom/CMakeLists.txt b/src/osgPlugins/dicom/CMakeLists.txt
index 8692be6a3..6b57d1ae5 100644
--- a/src/osgPlugins/dicom/CMakeLists.txt
+++ b/src/osgPlugins/dicom/CMakeLists.txt
@@ -1,6 +1,6 @@
 IF  (DCMTK_FOUND)
 
-    INCLUDE_DIRECTORIES( ${DCMTK_INCLUDE_DIRS} )
+    INCLUDE_DIRECTORIES( ${DCMTK_ROOT_INCLUDE_DIR})
 
     SET(TARGET_SRC ReaderWriterDICOM.cpp )
 
diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp
index c35cb0fd0..79f7edfbb 100644
--- a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp
+++ b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp
@@ -19,10 +19,10 @@
 
 #ifdef  USE_DCMTK
     #define HAVE_CONFIG_H
-    #include <osconfig.h> 
-    #include <dcfilefo.h>
-    #include <dcdeftag.h>
-    #include <dcmimage.h>
+    #include <dcmtk/config/osconfig.h> 
+    #include <dcmtk/dcmdata/dcfilefo.h>
+    #include <dcmtk/dcmdata/dcdeftag.h>
+    #include <dcmtk/dcmimgle/dcmimage.h>
 #endif
 
 #ifdef USE_ITK