From eae89e0f886e2026b93415ae659f88e48a7a20d1 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Tue, 5 Apr 2005 13:37:30 -0400
Subject: [PATCH] BUG: fix for bug 1652

---
 Modules/FindDCMTK.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index 3b0ec59da2..0cd7d89148 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -16,39 +16,44 @@
 # 
 
 FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
-  ${DCMTK_DIR}/config/include
+  ${DCMTK_DIR}/config/include ${DCMTK_DIR}/include
 )
 
 FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
-  ${DCMTK_DIR}/ofstd/include
+  ${DCMTK_DIR}/ofstd/include ${DCMTK_DIR}/include/ofstd
 )
 
 FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
   ${DCMTK_DIR}/ofstd/libsrc
   ${DCMTK_DIR}/ofstd/Release
   ${DCMTK_DIR}/ofstd/Debug
+  ${DCMTK_DIR}/lib
 )
 
 
 FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
   ${DCMTK_DIR}/dcmdata/include
+  ${DCMTK_DIR}/include/dcmdata
 )
 
 FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
   ${DCMTK_DIR}/dcmdata/libsrc
   ${DCMTK_DIR}/dcmdata/Release
   ${DCMTK_DIR}/dcmdata/Debug
+  ${DCMTK_DIR}/lib
 )
 
 
 FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
   ${DCMTK_DIR}/dcmimgle/include
+  ${DCMTK_DIR}/include/dcmimgle
 )
 
 FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
   ${DCMTK_DIR}/dcmimgle/libsrc
   ${DCMTK_DIR}/dcmimgle/Release
   ${DCMTK_DIR}/dcmimgle/Debug
+  ${DCMTK_DIR}/lib
 )