From 3528cdaa03f41252dc6517c97455c78d6b08167b Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 4 Jul 2012 16:50:04 +0200
Subject: [PATCH] COMP: remove workaround for CMake < 2.4 and follow OTB
 install tree for ITK

---
 Utilities/ITK/CMakeLists.txt                  | 30 ++++------------
 Utilities/ITK/Code/Algorithms/CMakeLists.txt  | 12 +++----
 .../ITK/Code/BasicFilters/CMakeLists.txt      | 12 +++----
 Utilities/ITK/Code/Common/CMakeLists.txt      | 18 +++++-----
 Utilities/ITK/Code/IO/CMakeLists.txt          | 14 ++++----
 Utilities/ITK/Code/Numerics/CMakeLists.txt    | 12 +++----
 .../ITK/Code/Numerics/FEM/CMakeLists.txt      | 12 +++----
 .../Numerics/NeuralNetworks/CMakeLists.txt    |  6 ++--
 .../Code/Numerics/Statistics/CMakeLists.txt   | 12 +++----
 Utilities/ITK/Code/Patented/CMakeLists.txt    |  6 ++--
 Utilities/ITK/Code/Review/CMakeLists.txt      | 36 +++++++++----------
 .../ITK/Code/Review/Statistics/CMakeLists.txt | 12 +++----
 .../ITK/Code/SpatialObject/CMakeLists.txt     | 12 +++----
 Utilities/ITK/Utilities/CMakeLists.txt        | 10 +++---
 .../ITK/Utilities/DICOMParser/CMakeLists.txt  | 12 +++----
 Utilities/ITK/Utilities/MetaIO/CMakeLists.txt |  8 ++---
 Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt | 12 +++----
 Utilities/ITK/Utilities/expat/CMakeLists.txt  | 12 +++----
 Utilities/ITK/Utilities/gdcm/CMakeLists.txt   |  2 +-
 .../ITK/Utilities/gdcm/Dicts/CMakeLists.txt   |  2 +-
 .../ITK/Utilities/gdcm/src/CMakeLists.txt     | 12 +++----
 .../ITK/Utilities/itkExtHdrs/CMakeLists.txt   |  6 ++--
 .../ITK/Utilities/itkjpeg/CMakeLists.txt      |  6 ++--
 Utilities/ITK/Utilities/itkpng/CMakeLists.txt | 12 +++----
 .../ITK/Utilities/itktiff/CMakeLists.txt      | 12 +++----
 .../ITK/Utilities/itkzlib/CMakeLists.txt      | 12 +++----
 .../Utilities/netlib/slatec/CMakeLists.txt    |  6 ++--
 Utilities/ITK/Utilities/nifti/CMakeLists.txt  |  8 ++---
 .../ITK/Utilities/openjpeg/CMakeLists.txt     |  6 ++--
 Utilities/ITK/Utilities/vxl/CMakeLists.txt    |  4 +--
 .../ITK/Utilities/vxl/core/vnl/CMakeLists.txt |  6 ++--
 .../vxl/core/vnl/algo/CMakeLists.txt          |  6 ++--
 .../Utilities/vxl/v3p/netlib/CMakeLists.txt   |  6 ++--
 .../vxl/v3p/netlib/linalg/CMakeLists.txt      |  6 ++--
 .../ITK/Utilities/vxl/vcl/CMakeLists.txt      |  6 ++--
 Utilities/ITK/Wrapping/CSwig/CMakeLists.txt   | 34 +++++++++---------
 .../ITK/Wrapping/CSwig/Java/CMakeLists.txt    |  4 +--
 .../Wrapping/CSwig/SwigRuntime/CMakeLists.txt | 24 ++++++-------
 .../ITK/Wrapping/CSwig/Tcl/CMakeLists.txt     |  4 +--
 Utilities/ITK/itkGenerateITKConfig.cmake      | 12 +++----
 40 files changed, 214 insertions(+), 230 deletions(-)

diff --git a/Utilities/ITK/CMakeLists.txt b/Utilities/ITK/CMakeLists.txt
index c1d5e4e612..136c4111fd 100644
--- a/Utilities/ITK/CMakeLists.txt
+++ b/Utilities/ITK/CMakeLists.txt
@@ -307,7 +307,7 @@ IF(NOT ITK_INSTALL_BIN_DIR)
   # executable. If only a 32 or 64 bit version is available, the executable should go in
   # bin. So it seems better to let the packagers deal with that.
   # Ref: http://docs.sun.com/app/docs/doc/816-5138/dev-env-13?a=view
-  SET(ITK_INSTALL_BIN_DIR "/bin")
+  SET(ITK_INSTALL_BIN_DIR OTB_INSTALL_BIN_DIR)
 ENDIF(NOT ITK_INSTALL_BIN_DIR)
 
 IF(NOT ITK_INSTALL_LIB_DIR)
@@ -334,20 +334,19 @@ IF(NOT ITK_INSTALL_LIB_DIR)
   ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
 # OTB Modifications
 #  SET(ITK_INSTALL_LIB_DIR "/lib/InsightToolkit${sun64}")
-  SET(ITK_INSTALL_LIB_DIR "/lib/otb${sun64}") 
+  SET(ITK_INSTALL_LIB_DIR OTB_INSTALL_LIB_DIR) 
 ENDIF(NOT ITK_INSTALL_LIB_DIR)
 
 IF(NOT ITK_INSTALL_DATA_DIR)
-  SET(ITK_INSTALL_DATA_DIR "/share/InsightToolkit")
+  SET(ITK_INSTALL_DATA_DIR OTB_INSTALL_DATA_DIR)
 ENDIF(NOT ITK_INSTALL_DATA_DIR)
 
 IF(NOT ITK_INSTALL_INCLUDE_DIR)
-  SET(ITK_INSTALL_INCLUDE_DIR "/include/InsightToolkit")
+  SET(ITK_INSTALL_INCLUDE_DIR OTB_INSTALL_INCLUDE_DIR)
 ENDIF(NOT ITK_INSTALL_INCLUDE_DIR)
 
 IF(NOT ITK_INSTALL_PACKAGE_DIR)
-  SET(ITK_INSTALL_PACKAGE_DIR ${ITK_INSTALL_LIB_DIR}
-    CACHE INTERNAL "")
+  SET(ITK_INSTALL_PACKAGE_DIR ${OTB_INSTALL_PACKAGE_DIR})
 ENDIF(NOT ITK_INSTALL_PACKAGE_DIR)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
@@ -373,21 +372,6 @@ ELSE(ITK_BUILD_SHARED_LIBS)
   ENDIF(ITK_INSTALL_NO_DEVELOPMENT)
 ENDIF(ITK_BUILD_SHARED_LIBS)
 
-# OTB Modifications: force install lib directory
-SET(ITK_INSTALL_PACKAGE_DIR "lib/otb")
-
-# Because INSTALL_* commands require a leading / and because INSTALL (cmake 2.4
-# and newer) requires no leading / to install under INSTALL_PREFIX, we
-# are stripping the leading /. In the future, there should be no leading
-# / in any install directory variables
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_LIB_DIR_CM24 "${ITK_INSTALL_LIB_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_BIN_DIR_CM24 "${ITK_INSTALL_BIN_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_INCLUDE_DIR_CM24 "${ITK_INSTALL_INCLUDE_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_PACKAGE_DIR_CM24 "${ITK_INSTALL_PACKAGE_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_DOXYGEN_DIR_CM24 "${ITK_INSTALL_DOXYGEN_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_TCL_DIR_CM24 "${ITK_INSTALL_TCL_DIR}")
-STRING(REGEX REPLACE "^/" "" ITK_INSTALL_JAVA_DIR_CM24 "${ITK_INSTALL_JAVA_DIR}")
-
 # Make sure the user does not try to install on top of the build tree.
 IF(WIN32 OR APPLE OR UNIX)
   STRING(TOLOWER "${CMAKE_INSTALL_PREFIX}" _PREFIX)
@@ -784,7 +768,7 @@ CONFIGURE_FILE(${ITK_SOURCE_DIR}/itkConfigure.h.in
   ${ITK_BINARY_DIR}/itkConfigure.h)
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${ITK_BINARY_DIR}/itkConfigure.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
@@ -871,7 +855,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
     ${ITK_BINARY_DIR}/ITKBuildSettings.cmake
     ${ITK_BINARY_DIR}/ITKLibraryDepends.cmake
     ${ITK_BINARY_DIR}/UseITK.cmake
-    DESTINATION ${ITK_INSTALL_PACKAGE_DIR_CM24}
+    DESTINATION ${ITK_INSTALL_PACKAGE_DIR}
     COMPONENT Development
     )
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Algorithms/CMakeLists.txt b/Utilities/ITK/Code/Algorithms/CMakeLists.txt
index bb9fadf186..1d4db2f8e4 100644
--- a/Utilities/ITK/Code/Algorithms/CMakeLists.txt
+++ b/Utilities/ITK/Code/Algorithms/CMakeLists.txt
@@ -30,21 +30,21 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKAlgorithms
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_ALGORITHMS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_ALGORITHMS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_ALGORITHMS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Algorithms)
+  SET( ITK_INSTALL_INCLUDE_DIR_ALGORITHMS ${ITK_INSTALL_INCLUDE_DIR}/Algorithms)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_ALGORITHMS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_ALGORITHMS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/BasicFilters/CMakeLists.txt b/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
index 6456c841d4..4e41420539 100644
--- a/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
+++ b/Utilities/ITK/Code/BasicFilters/CMakeLists.txt
@@ -6,15 +6,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKBasicFilters
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_BASICFILTERS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_BASICFILTERS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_BASICFILTERS ${ITK_INSTALL_INCLUDE_DIR_CM24}/BasicFilters)
+  SET( ITK_INSTALL_INCLUDE_DIR_BASICFILTERS ${ITK_INSTALL_INCLUDE_DIR}/BasicFilters)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -22,6 +22,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_BASICFILTERS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_BASICFILTERS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Common/CMakeLists.txt b/Utilities/ITK/Code/Common/CMakeLists.txt
index 55749ea90e..ba044357fc 100644
--- a/Utilities/ITK/Code/Common/CMakeLists.txt
+++ b/Utilities/ITK/Code/Common/CMakeLists.txt
@@ -165,17 +165,17 @@ ENDIF(MINGW)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKCommon itkvnl_inst
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_COMMON ${ITK_INSTALL_INCLUDE_DIR_CM24})
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_COMMON_TEMPLATES ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_COMMON ${ITK_INSTALL_INCLUDE_DIR})
+  SET( ITK_INSTALL_INCLUDE_DIR_COMMON_TEMPLATES ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_COMMON ${ITK_INSTALL_INCLUDE_DIR_CM24}/Common)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_COMMON_TEMPLATES ${ITK_INSTALL_INCLUDE_DIR_CM24}/Common/Templates)
+  SET( ITK_INSTALL_INCLUDE_DIR_COMMON ${ITK_INSTALL_INCLUDE_DIR}/Common)
+  SET( ITK_INSTALL_INCLUDE_DIR_COMMON_TEMPLATES ${ITK_INSTALL_INCLUDE_DIR}/Common/Templates)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -183,13 +183,13 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_COMMON}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_COMMON}
     COMPONENT Development)
 
   IF(ITK_EXPLICIT_INSTANTIATION)
     FILE(GLOB __files3 "${CMAKE_CURRENT_BINARY_DIR}/Templates/*.h")
     INSTALL(FILES ${__files3}
-      DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_COMMON_TEMPLATES}
+      DESTINATION ${ITK_INSTALL_INCLUDE_DIR_COMMON_TEMPLATES}
       COMPONENT Development)
   ENDIF(ITK_EXPLICIT_INSTANTIATION)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/IO/CMakeLists.txt b/Utilities/ITK/Code/IO/CMakeLists.txt
index e78585785a..de8749cf45 100644
--- a/Utilities/ITK/Code/IO/CMakeLists.txt
+++ b/Utilities/ITK/Code/IO/CMakeLists.txt
@@ -120,7 +120,7 @@ ENDIF(SUN_COMPILER)
 #TARGET_LINK_LIBRARIES(itkTestDriver ITKIO)
 #IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 #  INSTALL(TARGETS itkTestDriver
-#    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT Development)
+#    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT Development)
 #ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 #SET(ITK_TEST_DRIVER "${EXECUTABLE_OUTPUT_PATH}/itkTestDriver" 
 #    CACHE INTERNAL "itkTestDriver path to be used by subprojects")
@@ -131,21 +131,21 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKIO
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_IO ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_IO ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_IO ${ITK_INSTALL_INCLUDE_DIR_CM24}/IO)
+  SET( ITK_INSTALL_INCLUDE_DIR_IO ${ITK_INSTALL_INCLUDE_DIR}/IO)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_IO}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_IO}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Numerics/CMakeLists.txt b/Utilities/ITK/Code/Numerics/CMakeLists.txt
index 6392718c78..dd7d57edee 100644
--- a/Utilities/ITK/Code/Numerics/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/CMakeLists.txt
@@ -45,15 +45,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKNumerics
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Numerics)
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS ${ITK_INSTALL_INCLUDE_DIR}/Numerics)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -61,6 +61,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_NUMERICS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt b/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
index 9c2deb0b06..73673974f6 100644
--- a/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/FEM/CMakeLists.txt
@@ -215,15 +215,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKFEM
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_FEM ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_FEM ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_FEM ${ITK_INSTALL_INCLUDE_DIR_CM24}/Numerics/FEM)
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_FEM ${ITK_INSTALL_INCLUDE_DIR}/Numerics/FEM)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -231,6 +231,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_FEM}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_NUMERICS_FEM}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt b/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
index 3e28263d47..1da40154d7 100644
--- a/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/NeuralNetworks/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_NEURALNETWORKS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_NEURALNETWORKS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_NEURALNETWORKS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Numerics/NeuralNetworks)
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_NEURALNETWORKS ${ITK_INSTALL_INCLUDE_DIR}/Numerics/NeuralNetworks)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -10,6 +10,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_NEURALNETWORKS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_NUMERICS_NEURALNETWORKS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt b/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
index 425637f154..ece6fe6290 100644
--- a/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
+++ b/Utilities/ITK/Code/Numerics/Statistics/CMakeLists.txt
@@ -19,15 +19,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKStatistics 
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_STATISTICS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_STATISTICS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_STATISTICS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Numerics/Statistics)
+  SET( ITK_INSTALL_INCLUDE_DIR_NUMERICS_STATISTICS ${ITK_INSTALL_INCLUDE_DIR}/Numerics/Statistics)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -35,7 +35,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_NUMERICS_STATISTICS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_NUMERICS_STATISTICS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Code/Patented/CMakeLists.txt b/Utilities/ITK/Code/Patented/CMakeLists.txt
index 6079c652c8..1b319d3c58 100644
--- a/Utilities/ITK/Code/Patented/CMakeLists.txt
+++ b/Utilities/ITK/Code/Patented/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_PATENTED ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_PATENTED ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_PATENTED ${ITK_INSTALL_INCLUDE_DIR_CM24}/Patented)
+  SET( ITK_INSTALL_INCLUDE_DIR_PATENTED ${ITK_INSTALL_INCLUDE_DIR}/Patented)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -10,7 +10,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_PATENTED}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_PATENTED}
     COMPONENT Development)
 
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Code/Review/CMakeLists.txt b/Utilities/ITK/Code/Review/CMakeLists.txt
index 902379d51c..9e5392de4d 100644
--- a/Utilities/ITK/Code/Review/CMakeLists.txt
+++ b/Utilities/ITK/Code/Review/CMakeLists.txt
@@ -25,9 +25,9 @@ IF(ITK_LIBRARY_PROPERTIES)
 ENDIF(ITK_LIBRARY_PROPERTIES)
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKIOReview
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 # Use the new statistics framework..
@@ -56,9 +56,9 @@ IF(ITK_LIBRARY_PROPERTIES)
 ENDIF(ITK_LIBRARY_PROPERTIES)
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKTransformIOReview
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 ENDIF(ITK_USE_TRANSFORM_IO_FACTORIES)
@@ -82,9 +82,9 @@ ENDIF(ITK_USE_TRANSFORM_IO_FACTORIES)
 # ENDIF(ITK_LIBRARY_PROPERTIES)
 # IF(NOT ITK_INSTALL_NO_LIBRARIES)
 #   INSTALL(TARGETS ITKReview
-#     RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-#     LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-#     ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+#     RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+#     LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+#     ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 # ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 #
 #
@@ -105,9 +105,9 @@ IF(ITK_LIBRARY_PROPERTIES)
 ENDIF(ITK_LIBRARY_PROPERTIES)
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKIOMINC2
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 
@@ -122,9 +122,9 @@ ADD_LIBRARY(ITKQuadEdgeMesh ${ITK_REVIEW_BUILD_TYPE}
   )
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKQuadEdgeMesh
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 
@@ -139,9 +139,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 # install the development files
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_REVIEW ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW ${ITK_INSTALL_INCLUDE_DIR_CM24}/Review)
+  SET( ITK_INSTALL_INCLUDE_DIR_REVIEW ${ITK_INSTALL_INCLUDE_DIR}/Review)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -149,7 +149,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_REVIEW}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 # Warn the user about the license issues and lack of stability of the API
diff --git a/Utilities/ITK/Code/Review/Statistics/CMakeLists.txt b/Utilities/ITK/Code/Review/Statistics/CMakeLists.txt
index f967f68eed..371fc45147 100644
--- a/Utilities/ITK/Code/Review/Statistics/CMakeLists.txt
+++ b/Utilities/ITK/Code/Review/Statistics/CMakeLists.txt
@@ -23,15 +23,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKStatistics 
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW_STATISTICS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_REVIEW_STATISTICS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW_STATISTICS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Review/Statistics)
+  SET( ITK_INSTALL_INCLUDE_DIR_REVIEW_STATISTICS ${ITK_INSTALL_INCLUDE_DIR}/Review/Statistics)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -39,7 +39,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_REVIEW_STATISTICS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_REVIEW_STATISTICS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Code/SpatialObject/CMakeLists.txt b/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
index 81782fa74a..016fb5c35f 100644
--- a/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
+++ b/Utilities/ITK/Code/SpatialObject/CMakeLists.txt
@@ -13,21 +13,21 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKSpatialObject
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_SPATIALOBJECTS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_SPATIALOBJECTS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_SPATIALOBJECTS ${ITK_INSTALL_INCLUDE_DIR_CM24}/SpatialObject)
+  SET( ITK_INSTALL_INCLUDE_DIR_SPATIALOBJECTS ${ITK_INSTALL_INCLUDE_DIR}/SpatialObject)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_SPATIALOBJECTS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_SPATIALOBJECTS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Utilities/CMakeLists.txt b/Utilities/ITK/Utilities/CMakeLists.txt
index 1228d09c2e..e91d35eadb 100644
--- a/Utilities/ITK/Utilities/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/CMakeLists.txt
@@ -143,16 +143,16 @@ ENDIF(BUILD_DOXYGEN)
 # Install the UseITK.cmake file configured from the top-level.
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${ITK_BINARY_DIR}/Utilities/ITKConfig.cmake
-    DESTINATION ${ITK_INSTALL_PACKAGE_DIR_CM24}
+    DESTINATION ${ITK_INSTALL_PACKAGE_DIR}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
 #-----------------------------------------------------------------------------
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES ${ITK_INSTALL_INCLUDE_DIR}/Utilities)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -164,13 +164,13 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 #    ${ITK_SOURCE_DIR}/Utilities/itk_png.h
 #    ${ITK_SOURCE_DIR}/Utilities/metaIOConfig.h
 #    ${ITK_BINARY_DIR}/Utilities/NrrdIO/NrrdConfigure.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES}
     COMPONENT Development
     )
   IF(ITK_USE_LIBXML2)
     INSTALL(FILES
       "${ITK_BINARY_DIR}/Utilities/itk_libxml2.h"
-      DESTINATION "${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES}"
+      DESTINATION "${ITK_INSTALL_INCLUDE_DIR_UTILITIES}"
       COMPONENT Development
       )
   ENDIF(ITK_USE_LIBXML2)
diff --git a/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt b/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
index 7a71b5084c..6d757acc5d 100644
--- a/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/DICOMParser/CMakeLists.txt
@@ -62,15 +62,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ${DICOMPARSER_LIBRARY}
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES ${ITK_INSTALL_INCLUDE_DIR}/Utilities)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -78,6 +78,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2} ${PROJECT_BINARY_DIR}/DICOMCMakeConfig.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt b/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
index 1f368f085f..a1fb055789 100644
--- a/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/MetaIO/CMakeLists.txt
@@ -135,11 +135,11 @@ ELSE(METAIO_FOR_VTK)
   IF(METAIO_FOR_ITK)
     IF(NOT ITK_INSTALL_NO_LIBRARIES)
       INSTALL(TARGETS ${METAIO_NAMESPACE}
-              RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} 
+              RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} 
                       COMPONENT RuntimeLibraries
-              LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} 
+              LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} 
                       COMPONENT RuntimeLibraries
-              ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} 
+              ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} 
                       COMPONENT Development
               )
       #TODO: Install Copyright.txt
@@ -147,7 +147,7 @@ ELSE(METAIO_FOR_VTK)
     IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
       FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
       INSTALL(FILES ${__files}
-              DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/MetaIO
+              DESTINATION ${ITK_INSTALL_INCLUDE_DIR}/Utilities/MetaIO
                           COMPONENT Development)
     ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   ELSE(METAIO_FOR_ITK)
diff --git a/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt b/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
index 7ab92596c7..05f86abc5d 100644
--- a/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/NrrdIO/CMakeLists.txt
@@ -65,23 +65,23 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKNrrdIO
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development
     )
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_NRRDIO ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_NRRDIO ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_NRRDIO ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/NrrdIO)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_NRRDIO ${ITK_INSTALL_INCLUDE_DIR}/Utilities/NrrdIO)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_NRRDIO}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_NRRDIO}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Utilities/expat/CMakeLists.txt b/Utilities/ITK/Utilities/expat/CMakeLists.txt
index 63af56b84a..9702c598ae 100644
--- a/Utilities/ITK/Utilities/expat/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/expat/CMakeLists.txt
@@ -32,15 +32,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ITKEXPAT
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_EXPAT ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_EXPAT ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_EXPAT ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/expat)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_EXPAT ${ITK_INSTALL_INCLUDE_DIR}/Utilities/expat)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -48,6 +48,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES
     ${ITKEXPAT_BINARY_DIR}/expatDllConfig.h
     ${ITKEXPAT_SOURCE_DIR}/expat.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_EXPAT}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_EXPAT}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Utilities/gdcm/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
index 8e0668ffa3..16ccfd0753 100644
--- a/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/CMakeLists.txt
@@ -155,6 +155,6 @@ CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
 INSTALL(FILES ${GDCM_BINARY_DIR}/gdcmConfigure.h
-  DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/gdcm/src
+  DESTINATION ${ITK_INSTALL_INCLUDE_DIR}/gdcm/src
   COMPONENT Development)
 
diff --git a/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
index 0f85a4ab92..d14f2c04d8 100644
--- a/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/Dicts/CMakeLists.txt
@@ -114,7 +114,7 @@ INSTALL(FILES
   ${GDCM_SOURCE_DIR}/Dicts/DicomDir.dic
   ${GDCM_SOURCE_DIR}/Dicts/DictGroupName.dic
   ${GDCM_BINARY_DIR}/Dicts/gdcm.dic
-  DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/gdcm/Dicts
+  DESTINATION ${ITK_INSTALL_INCLUDE_DIR}/gdcm/Dicts
   COMPONENT RuntimeLibraries
   )
 
diff --git a/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt b/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
index 6865141e43..64f1971fe3 100644
--- a/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/gdcm/src/CMakeLists.txt
@@ -84,22 +84,22 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_GDCM_SRC ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_GDCM_SRC ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_GDCM_SRC ${ITK_INSTALL_INCLUDE_DIR_CM24}/gdcm/src)
+  SET( ITK_INSTALL_INCLUDE_DIR_GDCM_SRC ${ITK_INSTALL_INCLUDE_DIR}/gdcm/src)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 INSTALL(FILES ${__files}
-  DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_GDCM_SRC}
+  DESTINATION ${ITK_INSTALL_INCLUDE_DIR_GDCM_SRC}
   COMPONENT Development)
 IF(ITK_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(itkgdcm PROPERTIES ${ITK_LIBRARY_PROPERTIES})
 ENDIF(ITK_LIBRARY_PROPERTIES)
 INSTALL(TARGETS itkgdcm
-  RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-  LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-  ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+  RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+  LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+  ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 
 #
 # Turn off GCC warnings on files that use gdcmAssert
diff --git a/Utilities/ITK/Utilities/itkExtHdrs/CMakeLists.txt b/Utilities/ITK/Utilities/itkExtHdrs/CMakeLists.txt
index 3a46d968e3..46e0ae873c 100644
--- a/Utilities/ITK/Utilities/itkExtHdrs/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkExtHdrs/CMakeLists.txt
@@ -1,16 +1,16 @@
 PROJECT(ITKEXTHDRS)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKEXTHDRS ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKEXTHDRS ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKEXTHDRS ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkExtHdrs)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKEXTHDRS ${ITK_INSTALL_INCLUDE_DIR}/Utilities/itkExtHdrs)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
   INSTALL(FILES ${__files}
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKEXTHDRS}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKEXTHDRS}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Utilities/itkjpeg/CMakeLists.txt b/Utilities/ITK/Utilities/itkjpeg/CMakeLists.txt
index d493cfb8e2..9b85229e5a 100644
--- a/Utilities/ITK/Utilities/itkjpeg/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkjpeg/CMakeLists.txt
@@ -133,9 +133,9 @@ MACRO(ITK_JPEG_BODY BITRATE)
 
   IF(NOT ITK_INSTALL_NO_LIBRARIES)
     INSTALL(TARGETS itkjpeg${BITRATE}
-      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development
+      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development
       )
   ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 ENDMACRO(ITK_JPEG_BODY)
diff --git a/Utilities/ITK/Utilities/itkpng/CMakeLists.txt b/Utilities/ITK/Utilities/itkpng/CMakeLists.txt
index a26997fa0a..b75714b01c 100644
--- a/Utilities/ITK/Utilities/itkpng/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkpng/CMakeLists.txt
@@ -35,15 +35,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkpng
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKPNG ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKPNG ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKPNG ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkpng)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKPNG ${ITK_INSTALL_INCLUDE_DIR}/Utilities/itkpng)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
@@ -52,7 +52,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
     ${ITKPNG_SOURCE_DIR}/png.h
     ${ITKPNG_SOURCE_DIR}/pngconf.h
     ${ITKPNG_SOURCE_DIR}/itk_png_mangle.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ITKPNG}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_ITKPNG}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Utilities/itktiff/CMakeLists.txt b/Utilities/ITK/Utilities/itktiff/CMakeLists.txt
index 3de799548f..9e250d57fe 100644
--- a/Utilities/ITK/Utilities/itktiff/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itktiff/CMakeLists.txt
@@ -148,15 +148,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itktiff
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_TIFF ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_TIFF ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_TIFF ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itktiff)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_TIFF ${ITK_INSTALL_INCLUDE_DIR}/Utilities/itktiff)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 
@@ -168,7 +168,7 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
     ${ITKTIFF_SOURCE_DIR}/tiff.h
     ${ITKTIFF_SOURCE_DIR}/tiffio.h
     ${ITKTIFF_SOURCE_DIR}/tconf.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_TIFF}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_TIFF}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/ITK/Utilities/itkzlib/CMakeLists.txt b/Utilities/ITK/Utilities/itkzlib/CMakeLists.txt
index 2ca0a4f52c..53c559668c 100644
--- a/Utilities/ITK/Utilities/itkzlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/itkzlib/CMakeLists.txt
@@ -39,15 +39,15 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkzlib
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ZLIB ${ITK_INSTALL_INCLUDE_DIR_CM24})
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ZLIB ${ITK_INSTALL_INCLUDE_DIR})
 ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-  SET( ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ZLIB ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkzlib)
+  SET( ITK_INSTALL_INCLUDE_DIR_UTILITIES_ZLIB ${ITK_INSTALL_INCLUDE_DIR}/Utilities/itkzlib)
 ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
 IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
@@ -56,6 +56,6 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
     ${ITKZLIB_SOURCE_DIR}/zconf.h
     ${ITKZLIB_SOURCE_DIR}/itk_zlib_mangle.h
     ${ITKZLIB_BINARY_DIR}/zlibDllConfig.h
-    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24_UTILITIES_ZLIB}
+    DESTINATION ${ITK_INSTALL_INCLUDE_DIR_UTILITIES_ZLIB}
     COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/ITK/Utilities/netlib/slatec/CMakeLists.txt b/Utilities/ITK/Utilities/netlib/slatec/CMakeLists.txt
index 4961219c6a..e5c0edc2cc 100644
--- a/Utilities/ITK/Utilities/netlib/slatec/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/netlib/slatec/CMakeLists.txt
@@ -34,9 +34,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkNetlibSlatec
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
 
 IF (BORLAND)
diff --git a/Utilities/ITK/Utilities/nifti/CMakeLists.txt b/Utilities/ITK/Utilities/nifti/CMakeLists.txt
index 7078cac825..46d2b75f64 100644
--- a/Utilities/ITK/Utilities/nifti/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/nifti/CMakeLists.txt
@@ -28,13 +28,13 @@ IF("${ITK_VERSION_MAJOR}" GREATER 0.0)
   ADD_DEFINITIONS(-DITKZLIB)
   SET(PACKAGE_PREFIX "ITK")
   SET(NIFTI_LIBRARY_PROPERTIES ${ITK_LIBRARY_PROPERTIES})
-  SET(NIFTI_INSTALL_BIN_DIR "${ITK_INSTALL_BIN_DIR_CM24}")
-  SET(NIFTI_INSTALL_LIB_DIR "${ITK_INSTALL_LIB_DIR_CM24}")
+  SET(NIFTI_INSTALL_BIN_DIR "${ITK_INSTALL_BIN_DIR}")
+  SET(NIFTI_INSTALL_LIB_DIR "${ITK_INSTALL_LIB_DIR}")
 
   IF(ITK_USE_FLAT_DIRECTORY_INSTALL)
-    SET(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR_CM24}")
+    SET(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR}")
   ELSE(ITK_USE_FLAT_DIRECTORY_INSTALL)
-    SET(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities")
+    SET(NIFTI_INSTALL_INCLUDE_DIR "${ITK_INSTALL_INCLUDE_DIR}/Utilities")
   ENDIF(ITK_USE_FLAT_DIRECTORY_INSTALL)
 
   SET(NIFTI_ZLIB_LIBRARIES ${ITK_ZLIB_LIBRARIES})
diff --git a/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt b/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
index 7e31ac7d49..a51eb9bb79 100644
--- a/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/openjpeg/CMakeLists.txt
@@ -49,7 +49,7 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT ITK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ${OPJ_PREFIX}openjpeg
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
diff --git a/Utilities/ITK/Utilities/vxl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/CMakeLists.txt
index 10be92f47d..c249a766dd 100644
--- a/Utilities/ITK/Utilities/vxl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/CMakeLists.txt
@@ -34,8 +34,8 @@ SET(VXL_INSTALL_BIN_DIR ${ITK_INSTALL_BIN_DIR})
 SET(VXL_INSTALL_NO_DEVELOPMENT ${ITK_INSTALL_NO_DEVELOPMENT})
 SET(VXL_INSTALL_NO_LIBRARIES ${ITK_INSTALL_NO_LIBRARIES})
 
-STRING(REGEX REPLACE "^/" "" VXL_INSTALL_LIB_DIR_CM24 "${VXL_INSTALL_LIB_DIR}")
-STRING(REGEX REPLACE "^/" "" VXL_INSTALL_BIN_DIR_CM24 "${VXL_INSTALL_BIN_DIR}")
+STRING(REGEX REPLACE "^/" "" VXL_INSTALL_LIB_DIR "${VXL_INSTALL_LIB_DIR}")
+STRING(REGEX REPLACE "^/" "" VXL_INSTALL_BIN_DIR "${VXL_INSTALL_BIN_DIR}")
 
 IF(WIN32)
   IF(NOT UNIX)
diff --git a/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
index f9a62092b9..2ae6524336 100644
--- a/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/vnl/CMakeLists.txt
@@ -260,9 +260,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT VXL_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkvnl
-    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT VXL_INSTALL_NO_LIBRARIES)
 
 SUBDIRS(algo)
diff --git a/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
index e819ac5033..36dd0c7b1d 100644
--- a/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/core/vnl/algo/CMakeLists.txt
@@ -108,9 +108,9 @@ IF(NETLIB_FOUND)
 
   IF(NOT VXL_INSTALL_NO_LIBRARIES)
     INSTALL(TARGETS itkvnl_algo
-      RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+      RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF(NOT VXL_INSTALL_NO_LIBRARIES)
   IF(NOT VXL_INSTALL_NO_DEVELOPMENT)
     INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_ROOT}/core/vnl/algo ${vnl_algo_sources})
diff --git a/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
index a3a35a189d..c4d6c34352 100644
--- a/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/v3p/netlib/CMakeLists.txt
@@ -481,9 +481,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT VXL_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkv3p_netlib
-    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT VXL_INSTALL_NO_LIBRARIES)
 IF(NOT VXL_INSTALL_NO_DEVELOPMENT)
   INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_ROOT}/v3p/netlib ${v3p_netlib_sources})
diff --git a/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/CMakeLists.txt
index ea24157d7b..90e13b5b9a 100644
--- a/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/v3p/netlib/linalg/CMakeLists.txt
@@ -19,9 +19,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 
 IF(NOT VXL_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkv3p_lsqr
-    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT VXL_INSTALL_NO_LIBRARIES)
 IF(NOT VXL_INSTALL_NO_DEVELOPMENT)
   INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_ROOT}/v3p/netlib ${V3P_NETLIB_lsqr_SOURCES})
diff --git a/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt b/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
index bde15c7cc0..9ce1468275 100644
--- a/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
+++ b/Utilities/ITK/Utilities/vxl/vcl/CMakeLists.txt
@@ -378,9 +378,9 @@ ENDIF(ITK_LIBRARY_PROPERTIES)
 # Installation
 IF(NOT VXL_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS itkvcl
-    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${VXL_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${VXL_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT VXL_INSTALL_NO_LIBRARIES)
 IF(NOT VXL_INSTALL_NO_DEVELOPMENT)
   INSTALL_NOBASE_HEADER_FILES(${VXL_INSTALL_ROOT}/vcl ${vcl_sources})
diff --git a/Utilities/ITK/Wrapping/CSwig/CMakeLists.txt b/Utilities/ITK/Wrapping/CSwig/CMakeLists.txt
index 584ffcda62..49f485c2b4 100644
--- a/Utilities/ITK/Wrapping/CSwig/CMakeLists.txt
+++ b/Utilities/ITK/Wrapping/CSwig/CMakeLists.txt
@@ -359,7 +359,7 @@ CONFIGURE_FILE("${ITK_SOURCE_DIR}/Wrapping/CSwig/Tcl/pkgIndex.tcl.in"
                "${ITK_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
                IMMEDIATE @ONLY)
 INSTALL(FILES "${ITK_BINARY_DIR}/Wrapping/CSwig/Tcl/InstallOnly/Hide/pkgIndex.tcl"
-  DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/tcl
+  DESTINATION ${ITK_INSTALL_LIB_DIR}/tcl
   COMPONENT RuntimeLibraries)
 
 #-----------------------------------------------------------------------------
@@ -516,7 +516,7 @@ IF(ITK_CSWIG_PYTHON)
     ENDIF(ITK_CSWIG_CONFIGURATION_TYPES)
     INSTALL(
       DIRECTORY ${_FROMDIR}/
-      DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}
+      DESTINATION ${ITK_INSTALL_LIB_DIR}
       COMPONENT "RuntimeLibraries"
       FILES_MATCHING PATTERN "*.py"
       )
@@ -526,11 +526,11 @@ IF(ITK_CSWIG_PYTHON)
   FOREACH(file ${ITK_PYTHON_FILES})
     IF(ITK_CSWIG_CONFIGURATION_TYPES)
       INSTALL(FILES "${ITK_BINARY_DIR}/Wrapping/CSwig/Python/\${CMAKE_INSTALL_CONFIG_NAME}/${file}.py"
-        DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/python
+        DESTINATION ${ITK_INSTALL_LIB_DIR}/python
         COMPONENT RuntimeLibraries)
     ELSE(ITK_CSWIG_CONFIGURATION_TYPES)
       INSTALL(FILES "${ITK_BINARY_DIR}/Wrapping/CSwig/Python/${file}.py"
-        DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/python
+        DESTINATION ${ITK_INSTALL_LIB_DIR}/python
         COMPONENT RuntimeLibraries)
     ENDIF(ITK_CSWIG_CONFIGURATION_TYPES)
   ENDFOREACH(file)
@@ -542,7 +542,7 @@ IF(ITK_CSWIG_PYTHON)
                  "${ITK_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
                  @ONLY IMMEDIATE)
   INSTALL(FILES "${ITK_BINARY_DIR}/Wrapping/CSwig/Python/InstallOnly/itkbase.py"
-    DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/python
+    DESTINATION ${ITK_INSTALL_LIB_DIR}/python
     COMPONENT RuntimeLibraries)
 ENDIF(ITK_CSWIG_PYTHON)
 
@@ -616,9 +616,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
     ENDIF(ITK_LIBRARY_PROPERTIES)
     TARGET_LINK_LIBRARIES(${LIBRARY_NAME}Tcl ${EXTRA_LIBS} SwigRuntimeTcl ${TCL_LIBRARY})
     INSTALL(TARGETS ${LIBRARY_NAME}Tcl
-      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
     IF(ITK_SWIG_FILE)
       ADD_CUSTOM_COMMAND(
         COMMENT "run native swig on ${ITK_SWIG_FILE}"
@@ -657,9 +657,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
       ENDFOREACH(lib)
     ENDIF(ITK_WRAP_NEEDS_DEPEND)
     INSTALL(TARGETS ${LIBRARY_NAME}Perl
-      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
     IF(ITK_SWIG_FILE)
       ADD_CUSTOM_COMMAND(
         COMMENT "run native swig on ${ITK_SWIG_FILE}"
@@ -706,9 +706,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
 
     TARGET_LINK_LIBRARIES(_${LIBRARY_NAME}Python ${EXTRA_LIBS} SwigRuntimePython ${PYTHON_LIBRARY})
     INSTALL(TARGETS _${LIBRARY_NAME}Python
-      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
     IF(ITK_SWIG_FILE)
       ADD_CUSTOM_COMMAND(
         COMMENT "run native swig on ${ITK_SWIG_FILE}"
@@ -745,9 +745,9 @@ MACRO(ITK_WRAP_LIBRARY WRAP_SOURCES LIBRARY_NAME DIRECTORY DEPEND_LIBRARY EXTRA_
       SET_TARGET_PROPERTIES(${LIBRARY_NAME}Java PROPERTIES ${ITK_LIBRARY_PROPERTIES})
     ENDIF(ITK_LIBRARY_PROPERTIES)
     INSTALL(TARGETS ${LIBRARY_NAME}Java
-      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+      RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+      LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+      ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
     IF(ITK_SWIG_FILE)
       ADD_CUSTOM_COMMAND(
         COMMENT "run native swig on ${ITK_SWIG_FILE}"
diff --git a/Utilities/ITK/Wrapping/CSwig/Java/CMakeLists.txt b/Utilities/ITK/Wrapping/CSwig/Java/CMakeLists.txt
index ac70dd4635..0ffbdbdd75 100644
--- a/Utilities/ITK/Wrapping/CSwig/Java/CMakeLists.txt
+++ b/Utilities/ITK/Wrapping/CSwig/Java/CMakeLists.txt
@@ -76,7 +76,7 @@ IF(CMAKE_CONFIGURATION_TYPES)
   SET(DOLLAR "$")
   INSTALL(FILES
     ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/${DOLLAR}{BUILD_TYPE}/InsightToolkit.jar
-    DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}
+    DESTINATION ${ITK_INSTALL_LIB_DIR}
     COMPONENT RuntimeLibraries)
 ELSE(CMAKE_CONFIGURATION_TYPES)
   ADD_CUSTOM_COMMAND(
@@ -90,7 +90,7 @@ ELSE(CMAKE_CONFIGURATION_TYPES)
   ADD_CUSTOM_TARGET(ITKJavaJar ALL DEPENDS ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar)
   INSTALL(FILES
     ${ITK_BINARY_DIR}/Wrapping/CSwig/Java/InsightToolkit.jar
-    DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}
+    DESTINATION ${ITK_INSTALL_LIB_DIR}
     COMPONENT RuntimeLibraries)
 ENDIF(CMAKE_CONFIGURATION_TYPES)
 ADD_DEPENDENCIES(ITKJavaJar ${ITK_JAVA_KIT_LIBS} SwigRuntimeJava)
diff --git a/Utilities/ITK/Wrapping/CSwig/SwigRuntime/CMakeLists.txt b/Utilities/ITK/Wrapping/CSwig/SwigRuntime/CMakeLists.txt
index a36febc104..bb1c5b415f 100644
--- a/Utilities/ITK/Wrapping/CSwig/SwigRuntime/CMakeLists.txt
+++ b/Utilities/ITK/Wrapping/CSwig/SwigRuntime/CMakeLists.txt
@@ -23,9 +23,9 @@ IF(ITK_CSWIG_TCL)
   ENDIF(ITK_LIBRARY_PROPERTIES)
   TARGET_LINK_LIBRARIES(SwigRuntimeTcl ${TCL_LIBRARY})
   INSTALL(TARGETS SwigRuntimeTcl
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(ITK_CSWIG_TCL)
 
 IF(ITK_CSWIG_PYTHON)
@@ -35,9 +35,9 @@ IF(ITK_CSWIG_PYTHON)
     SET_TARGET_PROPERTIES(SwigRuntimePython PROPERTIES ${ITK_LIBRARY_PROPERTIES})
   ENDIF(ITK_LIBRARY_PROPERTIES)
   INSTALL(TARGETS SwigRuntimePython
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(ITK_CSWIG_PYTHON)
 
 IF(ITK_CSWIG_PERL)
@@ -47,9 +47,9 @@ IF(ITK_CSWIG_PERL)
     SET_TARGET_PROPERTIES(SwigRuntimePerl PROPERTIES ${ITK_LIBRARY_PROPERTIES})
   ENDIF(ITK_LIBRARY_PROPERTIES)
   INSTALL(TARGETS SwigRuntimePerl
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(ITK_CSWIG_PERL)
 
 MACRO(CREATE_SWIG_RUNTIME LangOption LibName LangPostFix)
@@ -91,9 +91,9 @@ IF(ITK_CSWIG_JAVA)
     SET_TARGET_PROPERTIES(SwigRuntimeJava PROPERTIES ${ITK_LIBRARY_PROPERTIES})
   ENDIF(ITK_LIBRARY_PROPERTIES)
   INSTALL(TARGETS SwigRuntimeJava
-    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${ITK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT Development)
   MAKE_DIRECTORY(${WrapITK_BINARY_DIR}/Java/InsightToolkit)
   ADD_CUSTOM_COMMAND(
         COMMENT "run native swig on SwigExtras.i"
diff --git a/Utilities/ITK/Wrapping/CSwig/Tcl/CMakeLists.txt b/Utilities/ITK/Wrapping/CSwig/Tcl/CMakeLists.txt
index 149bab437a..a584d0703e 100644
--- a/Utilities/ITK/Wrapping/CSwig/Tcl/CMakeLists.txt
+++ b/Utilities/ITK/Wrapping/CSwig/Tcl/CMakeLists.txt
@@ -24,11 +24,11 @@ IF(ITK_LIBRARY_PROPERTIES)
   SET_TARGET_PROPERTIES(itkwish PROPERTIES ${ITK_LIBRARY_PROPERTIES})
 ENDIF(ITK_LIBRARY_PROPERTIES)
 INSTALL(TARGETS itkwish
-  RUNTIME DESTINATION ${ITK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeExecutables)
+  RUNTIME DESTINATION ${ITK_INSTALL_LIB_DIR} COMPONENT RuntimeExecutables)
 
 INSTALL(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/itkinteraction.tcl
   ${CMAKE_CURRENT_SOURCE_DIR}/itktesting.tcl
   ${CMAKE_CURRENT_SOURCE_DIR}/itkdata.tcl
-  DESTINATION ${ITK_INSTALL_LIB_DIR_CM24}/tcl
+  DESTINATION ${ITK_INSTALL_LIB_DIR}/tcl
   COMPONENT RuntimeLibraries)
diff --git a/Utilities/ITK/itkGenerateITKConfig.cmake b/Utilities/ITK/itkGenerateITKConfig.cmake
index ae45f7f793..d75f4d2c10 100644
--- a/Utilities/ITK/itkGenerateITKConfig.cmake
+++ b/Utilities/ITK/itkGenerateITKConfig.cmake
@@ -69,25 +69,25 @@ CONFIGURE_FILE(${ITK_SOURCE_DIR}/ITKConfig.cmake.in
 # Settings specific to the install tree.
 
 # The library dependencies file.
-SET(ITK_LIBRARY_DEPENDS_FILE "\${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/ITKLibraryDepends.cmake")
+SET(ITK_LIBRARY_DEPENDS_FILE "\${ITK_INSTALL_PREFIX}/${ITK_INSTALL_PACKAGE_DIR}/ITKLibraryDepends.cmake")
 
 # The "use" file.
-SET(ITK_USE_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/UseITK.cmake)
+SET(ITK_USE_FILE \${ITK_INSTALL_PREFIX}/${ITK_INSTALL_PACKAGE_DIR}/UseITK.cmake)
 
 # The build settings file.
-SET(ITK_BUILD_SETTINGS_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/ITKBuildSettings.cmake)
+SET(ITK_BUILD_SETTINGS_FILE \${ITK_INSTALL_PREFIX}/${ITK_INSTALL_PACKAGE_DIR}/ITKBuildSettings.cmake)
 
 # Include directories.
-SET(ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}${ITK_INSTALL_INCLUDE_DIR})
+SET(ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}/${ITK_INSTALL_INCLUDE_DIR})
 FOREACH(DIR ${ITK_INCLUDE_RELATIVE_DIRS})
-  LIST(APPEND ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}${ITK_INSTALL_INCLUDE_DIR}/${DIR})
+  LIST(APPEND ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}/${ITK_INSTALL_INCLUDE_DIR}/${DIR})
 ENDFOREACH(DIR)
 IF(ITK_INCLUDE_DIRS_SYSTEM)
   LIST(APPEND ITK_INCLUDE_DIRS_CONFIG ${ITK_INCLUDE_DIRS_SYSTEM})
 ENDIF(ITK_INCLUDE_DIRS_SYSTEM)
 
 # Link directories.
-SET(ITK_LIBRARY_DIRS_CONFIG "\${ITK_INSTALL_PREFIX}${ITK_INSTALL_LIB_DIR}")
+SET(ITK_LIBRARY_DIRS_CONFIG "\${ITK_INSTALL_PREFIX}/${ITK_INSTALL_LIB_DIR}")
 
 # The CableSwig configuration directory.
 IF(ITK_NEED_CableSwig)
-- 
GitLab