[Insight-developers] Proposed patch for Utilities/nifti

[Kent Williams]

I'm testing some very straightforward changes affecting Utilies/nifti 
and Code/IO. 

Utilities/nifti:
These don't affect the normal in-source build at all, but define the 
ITK_INSTALL_XXX_DIR_CM24 variables if nifti is built standalone.  This 
means the CMake build files can be pushed back to the Sourceforge 
version of Niftilib, and be in sync with the Insight version.

Code/IO:
If for some reason (and there are valid reasons to do so) a program 
includes any of the header files that were moved to itkExtHdrs when 
building against an installed ITK tree, the build will fail, because the 
installation has no itkExtHdrs directory in include.

I don't have write access to the repository, so if someone could take a 
quick look to make sure I'm not screwing anything up, I'd be much obliged.



Index: Code/IO/itkAnalyzeImageIO.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkAnalyzeImageIO.h,v
retrieving revision 1.18
diff -c -b -w -r1.18 itkAnalyzeImageIO.h
*** Code/IO/itkAnalyzeImageIO.h    4 Nov 2006 13:53:52 -0000    1.18
--- Code/IO/itkAnalyzeImageIO.h    10 Nov 2006 16:32:48 -0000
***************
*** 35,41 ****
 
  #include <fstream>
  #include "itkImageIOBase.h"
! #include "itkExtHdrs/itkAnalyzeDbh.h"
 
  namespace itk
  {
--- 35,41 ----
 
  #include <fstream>
  #include "itkImageIOBase.h"
! #include "itkAnalyzeDbh.h"
 
  namespace itk
  {
Index: Code/IO/itkGE5ImageIO.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/IO/itkGE5ImageIO.h,v
retrieving revision 1.9
diff -c -b -w -r1.9 itkGE5ImageIO.h
*** Code/IO/itkGE5ImageIO.h    4 Nov 2006 13:53:52 -0000    1.9
--- Code/IO/itkGE5ImageIO.h    10 Nov 2006 16:32:48 -0000
***************
*** 39,45 ****
  #include "itkImageIOBase.h"
  #include "itkIPLCommonImageIO.h"
  #include "itkGEImageHeader.h"
! #include "itkExtHdrs/Ge5xHdr.h"
 
  namespace itk
  {
--- 39,45 ----
  #include "itkImageIOBase.h"
  #include "itkIPLCommonImageIO.h"
  #include "itkGEImageHeader.h"
! #include "Ge5xHdr.h"
 
  namespace itk
  {
Index: 
Testing/Data/Baseline/Statistics/ScalarImageKmeansClassifierOutput.png
===================================================================
RCS file: 
/cvsroot/Insight/Insight/Testing/Data/Baseline/Statistics/ScalarImageKmeansClassifierOutput.png,v
retrieving revision 1.1
diff -c -b -w -r1.1 ScalarImageKmeansClassifierOutput.png
Binary files /mounts/ram/cvsTcJ8v2 and 
ScalarImageKmeansClassifierOutput.png differ
Index: Utilities/nifti/CMakeLists.txt
===================================================================
RCS file: /cvsroot/Insight/Insight/Utilities/nifti/CMakeLists.txt,v
retrieving revision 1.11
diff -c -b -w -r1.11 CMakeLists.txt
*** Utilities/nifti/CMakeLists.txt    29 Sep 2006 19:41:50 -0000    1.11
--- Utilities/nifti/CMakeLists.txt    10 Nov 2006 16:32:49 -0000
***************
*** 4,9 ****
--- 4,21 ----
  # Configure Dart testing support.
  INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
 
+ IF(NOT ITK_INSTALL_BIN_DIR_CM24)
+   SET(ITK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
+ ENDIF(NOT ITK_INSTALL_BIN_DIR_CM24)
+
+ IF(NOT ITK_INSTALL_LIB_DIR_CM24)
+   SET(ITK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
+ ENDIF(NOT ITK_INSTALL_LIB_DIR_CM24)
+
+ IF(NOT ITK_INSTALL_INCLUDE_DIR_CM24)
+   SET(ITK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
+ ENDIF(NOT ITK_INSTALL_INCLUDE_DIR_CM24)
+
  SUBDIRS(znzlib niftilib)