From ded06dc421537d091dd29889830d83d8c0436b6a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Jan 2009 16:10:40 +0000
Subject: [PATCH] Restructured the include paths

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

diff --git a/CMakeModules/FindOurDCMTK.cmake b/CMakeModules/FindOurDCMTK.cmake
index b8a77954c..760772af9 100644
--- a/CMakeModules/FindOurDCMTK.cmake
+++ b/CMakeModules/FindOurDCMTK.cmake
@@ -1,8 +1,7 @@
 # - find DCMTK libraries
 #
 
-#  DCMTK_INCLUDE_DIR   - Directories to include to use DCMTK
-#  DCMTK_ROOT_INCLUDE_DIR - root directory of DCMTK related include directories
+#  DCMTK_INCLUDE_DIRS  - Directories to include to use DCMTK
 #  DCMTK_LIBRARIES     - Files to link against to use DCMTK
 #  DCMTK_FOUND         - If false, don't try to use DCMTK
 #  DCMTK_DIR           - (optional) Source directory for DCMTK
@@ -15,14 +14,6 @@
 # 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
@@ -131,7 +122,7 @@ IF( DCMTK_config_INCLUDE_DIR
     AND DCMTK_dcmimgle_LIBRARY )
 
   SET( DCMTK_FOUND "YES" )
-  SET( DCMTK_INCLUDE_DIR
+  SET( DCMTK_INCLUDE_DIRS
     ${DCMTK_config_INCLUDE_DIR}
     ${DCMTK_ofstd_INCLUDE_DIR}
     ${DCMTK_dcmdata_INCLUDE_DIR}
diff --git a/src/osgPlugins/dicom/CMakeLists.txt b/src/osgPlugins/dicom/CMakeLists.txt
index f3596c5af..8692be6a3 100644
--- a/src/osgPlugins/dicom/CMakeLists.txt
+++ b/src/osgPlugins/dicom/CMakeLists.txt
@@ -1,6 +1,6 @@
 IF  (DCMTK_FOUND)
 
-    INCLUDE_DIRECTORIES( ${DCMTK_ROOT_INCLUDE_DIR} )
+    INCLUDE_DIRECTORIES( ${DCMTK_INCLUDE_DIRS} )
 
     SET(TARGET_SRC ReaderWriterDICOM.cpp )
 
diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp
index 79f7edfbb..c35cb0fd0 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 <dcmtk/config/osconfig.h> 
-    #include <dcmtk/dcmdata/dcfilefo.h>
-    #include <dcmtk/dcmdata/dcdeftag.h>
-    #include <dcmtk/dcmimgle/dcmimage.h>
+    #include <osconfig.h> 
+    #include <dcfilefo.h>
+    #include <dcdeftag.h>
+    #include <dcmimage.h>
 #endif
 
 #ifdef USE_ITK