[Cmake-commits] [cmake-commits] malaterre committed FindDCMTK.cmake 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23358

Modified Files:
	FindDCMTK.cmake 
Log Message:
FIX: BUG: 0009804. Update FindDCMTK to look in more paths. Start looking for command line tool: dcmdump/dcmdjpeg/dcmdrle


Index: FindDCMTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDCMTK.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** FindDCMTK.cmake	28 Sep 2009 15:45:33 -0000	1.6
--- FindDCMTK.cmake	30 Oct 2009 15:48:44 -0000	1.7
***************
*** 1,3 ****
! # - find DCMTK libraries
  #
  
--- 1,3 ----
! # - find DCMTK libraries and applications
  #
  
***************
*** 10,17 ****
  # directories and compiled libraries if you've just compiled it in the
  # source tree. Just set it to the root of the tree where you extracted
! # the source.
  
  #=============================================================================
  # Copyright 2004-2009 Kitware, Inc.
  #
  # Distributed under the OSI-approved BSD License (the "License");
--- 10,18 ----
  # directories and compiled libraries if you've just compiled it in the
  # source tree. Just set it to the root of the tree where you extracted
! # the source (default to /usr/include/dcmtk/)
  
  #=============================================================================
  # Copyright 2004-2009 Kitware, Inc.
+ # Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
  #
  # Distributed under the OSI-approved BSD License (the "License");
***************
*** 27,38 ****
  #
  # Written for VXL by Amitha Perera.
  # 
  
  FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
!   ${DCMTK_DIR}/config/include ${DCMTK_DIR}/include
  )
  
  FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
!   ${DCMTK_DIR}/ofstd/include ${DCMTK_DIR}/include/ofstd
  )
  
--- 28,51 ----
  #
  # Written for VXL by Amitha Perera.
+ # Upgraded for GDCM by Mathieu Malaterre.
  # 
  
+ IF( NOT DCMTK_FOUND )
+   SET( DCMTK_DIR "/usr/include/dcmtk/"
+     CACHE PATH "Root of DCMTK source tree (optional)." )
+   MARK_AS_ADVANCED( DCMTK_DIR )
+ ENDIF( NOT DCMTK_FOUND )
+ 
+ 
  FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
!   ${DCMTK_DIR}/config/include
!   ${DCMTK_DIR}/config
!   ${DCMTK_DIR}/include
  )
  
  FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
!   ${DCMTK_DIR}/ofstd/include
!   ${DCMTK_DIR}/ofstd
!   ${DCMTK_DIR}/include/ofstd
  )
  
***************
*** 48,53 ****
  
  FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
-   ${DCMTK_DIR}/dcmdata/include
    ${DCMTK_DIR}/include/dcmdata
  )
  
--- 61,67 ----
  
  FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
    ${DCMTK_DIR}/include/dcmdata
+   ${DCMTK_DIR}/dcmdata
+   ${DCMTK_DIR}/dcmdata/include
  )
  
***************
*** 64,67 ****
--- 78,82 ----
  FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
    ${DCMTK_DIR}/dcmimgle/include
+   ${DCMTK_DIR}/dcmimgle
    ${DCMTK_DIR}/include/dcmimgle
  )
***************
*** 76,90 ****
  )
  
  FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb 
! ${DCMTK_DIR}/imagectn/libsrc/Release
! ${DCMTK_DIR}/imagectn/libsrc/
! ${DCMTK_DIR}/imagectn/libsrc/Debug
! )
  
  FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet 
! ${DCMTK_DIR}/dcmnet/libsrc/Release
! ${DCMTK_DIR}/dcmnet/libsrc/Debug
! ${DCMTK_DIR}/dcmnet/libsrc/
! )
  
  
--- 91,106 ----
  )
  
+ # MM: I could not find this library on debian system / dcmtk 3.5.4
  FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb 
!   ${DCMTK_DIR}/imagectn/libsrc/Release
!   ${DCMTK_DIR}/imagectn/libsrc/
!   ${DCMTK_DIR}/imagectn/libsrc/Debug
!   )
  
  FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet 
!   ${DCMTK_DIR}/dcmnet/libsrc/Release
!   ${DCMTK_DIR}/dcmnet/libsrc/Debug
!   ${DCMTK_DIR}/dcmnet/libsrc/
!   )
  
  
***************
*** 138,143 ****
      AND DCMTK_dcmimgle_LIBRARY )
  
! IF( NOT DCMTK_FOUND )
!   SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." )
!   MARK_AS_ADVANCED( DCMTK_DIR )
! ENDIF( NOT DCMTK_FOUND )
--- 154,181 ----
      AND DCMTK_dcmimgle_LIBRARY )
  
! FIND_PROGRAM(DCMTK_DCMDUMP_EXECUTABLE dcmdump
!   ${DCMTK_DIR}/bin
!   )
! 
! FIND_PROGRAM(DCMTK_DCMDJPEG_EXECUTABLE dcmdjpeg
!   ${DCMTK_DIR}/bin
!   )
! 
! FIND_PROGRAM(DCMTK_DCMDRLE_EXECUTABLE dcmdrle
!   ${DCMTK_DIR}/bin
!   )
! 
! MARK_AS_ADVANCED(
!   DCMTK_DCMDUMP_EXECUTABLE
!   DCMTK_DCMDJPEG_EXECUTABLE
!   DCMTK_DCMDRLE_EXECUTABLE
!   DCMTK_config_INCLUDE_DIR
!   DCMTK_dcmdata_INCLUDE_DIR
!   DCMTK_dcmdata_LIBRARY
!   DCMTK_dcmimgle_INCLUDE_DIR
!   DCMTK_dcmimgle_LIBRARY
!   DCMTK_dcmnet_LIBRARY
!   DCMTK_ofstd_INCLUDE_DIR
!   DCMTK_ofstd_LIBRARY
!   )
!