CHG: removed USE_ITK_3_ZLIB variable, since only ITK >=3 is supported

Author: nolden

CMakeLists.txt

@@ -45,11 +45,6 @@ ELSE(UNIX)
 OPTION(BUILD_SHARED_LIBS "Build MITK with shared libraries." OFF)
 ENDIF(UNIX)
 OPTION(USE_ITKZLIB "Use the ITK zlib for pic compression." ON)
-IF(USE_ITKZLIB)
-  IF(ITK_VERSION_MAJOR GREATER 2)
-    SET(USE_ITK_3_ZLIB TRUE)
-  ENDIF(ITK_VERSION_MAJOR GREATER 2)
-ENDIF(USE_ITKZLIB)
 OPTION(MITK_CHILI_PLUGIN "Build MITK for use as a CHILI plugin" OFF)
 IF(MITK_CHILI_PLUGIN)
   FIND_PATH(MITK_CHILI_PLUGIN_SDK sdk

Utilities/ipPic/ipPic.h

@@ -590,11 +590,7 @@ extern DWORD ipWinFread(LPSTR ptr, DWORD size, DWORD n, FILE *stream);
 #  define ipPicFWrite _ipPicFWrite
 #  define ipPicFEOF gzeof
 #  define ipPicFClose gzclose
-#  ifdef USE_ITK_3_ZLIB
-#    include "itk_zlib_mangle_itk3.h"
-#  else
-#    include "itk_zlib_mangle.h"
-#  endif 
+#  include "itk_zlib_mangle_itk3.h"
 #  include "itkzlib/zlib.h"
 #else
 #  include "itkzlib/zlib.h"

mitkConfig.h.in

@@ -4,7 +4,6 @@
 */
 #define MITK_ROOT "${PROJECT_SOURCE_DIR}/"
 #cmakedefine USE_ITKZLIB
-#cmakedefine USE_ITK_3_ZLIB
 #cmakedefine MITK_CHILI_PLUGIN
 #cmakedefine BUILD_TESTING
 #define MITK_CHILI_PLUGIN_SDK_IPPIC_H "@MITK_CHILI_PLUGIN_SDK_IPPIC_H@"

zlib.h.in

@@ -1,2 +1,2 @@
-#include "@CHILI_ZLIB_H@"
+#include "@MITK_ZLIB_H@"