diff --git a/CMake/ImportJPEG2000.cmake b/CMake/ImportJPEG2000.cmake
index af6c914af2392a62cba13ceb1c323034d383786e..862a70bb9abb010a09f5852864478164f349680d 100644
--- a/CMake/ImportJPEG2000.cmake
+++ b/CMake/ImportJPEG2000.cmake
@@ -11,7 +11,7 @@ IF(OTB_USE_JPEG2000)
  
  SET(OPENJPEG_NAMESPACE "OTBOPENJPEG")
  SET(OPJ_MANGLE_PREFIX "otbopenjpeg")
- SET(OPENJPEG_INSTALL_LIB_DIR ${OTB_INSTALL_LIB_DIR_CM24})
+ SET(OPENJPEG_INSTALL_LIB_DIR ${OTB_INSTALL_LIB_DIR})
 
   IF(NOT BUILD_SHARED_LIBS)
         ADD_DEFINITIONS(-DOPJ_STATIC)
diff --git a/CMake/OTBWrapperMacros.cmake b/CMake/OTBWrapperMacros.cmake
index ed1e4e28bc9cf94b7f6f25e4367eb109b9adcc9d..64f1cd1c7b3ccc6691e647030471ee40c551d38f 100644
--- a/CMake/OTBWrapperMacros.cmake
+++ b/CMake/OTBWrapperMacros.cmake
@@ -29,9 +29,9 @@ macro(OTB_CREATE_APPLICATION)
      set_target_properties(${APPLICATION_TARGET_NAME} PROPERTIES SUFFIX ".dylib")
    endif()
 
-   # When called from the OTB build system, use OTB_INSTALL_APP_DIR_CM24
-   if (NOT APPLICATION_INSTALL_PATH AND OTB_INSTALL_APP_DIR_CM24)
-     set(APPLICATION_INSTALL_PATH ${OTB_INSTALL_APP_DIR_CM24})
+   # When called from the OTB build system, use OTB_INSTALL_APP_DIR
+   if (NOT APPLICATION_INSTALL_PATH AND OTB_INSTALL_APP_DIR)
+     set(APPLICATION_INSTALL_PATH ${OTB_INSTALL_APP_DIR})
    endif()
    
    if (APPLICATION_INSTALL_PATH)
@@ -71,10 +71,10 @@ macro(OTB_CREATE_APPLICATION)
                DESTINATION ${APPLICATION_BINARY_PATH}
                FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)  
     
-          if (OTB_INSTALL_BIN_DIR_CM24)
+          if (OTB_INSTALL_BIN_DIR)
               # Install a version of this script if we are inside the OTB build
               install(PROGRAMS ${SCRIPT_CLI_INSTALLABLE}
-                      DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}
+                      DESTINATION ${OTB_INSTALL_BIN_DIR}
                       COMPONENT RuntimeLibraries)
           endif()
       endif()
@@ -100,10 +100,10 @@ macro(OTB_CREATE_APPLICATION)
                DESTINATION ${APPLICATION_BINARY_PATH}
                FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)  
 
-          if (OTB_INSTALL_BIN_DIR_CM24)
+          if (OTB_INSTALL_BIN_DIR)
               # Install a version of this script if we are inside the OTB build
               install(PROGRAMS ${SCRIPT_GUI_INSTALLABLE}
-                      DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
+                      DESTINATION ${OTB_INSTALL_BIN_DIR})
           endif()
       endif()
    #endif(NOT WIN32)
diff --git a/CMake/otbcli.bat.installtree.in b/CMake/otbcli.bat.installtree.in
index d88f314731359863f0621c3e6dc2a14282971a51..f562f96f1e25a4d2d3c3608a11746ae56547163c 100644
--- a/CMake/otbcli.bat.installtree.in
+++ b/CMake/otbcli.bat.installtree.in
@@ -15,8 +15,8 @@ if exist %CURRENT_SCRIPT_DIR%otbApplicationLauncherCommandLine.exe (
 )
 
 :: works for install tree
-if exist %CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR_CM24@ (
-  set ITK_AUTOLOAD_PATH=%CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR_CM24@;%ITK_AUTOLOAD_PATH%
+if exist %CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR@ (
+  set ITK_AUTOLOAD_PATH=%CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR@;%ITK_AUTOLOAD_PATH%
 )
 
 :: start the application
diff --git a/CMake/otbcli.sh.installtree.in b/CMake/otbcli.sh.installtree.in
index fb4b6a9aa57eb79c3b5cf0e4a1cf7de922580368..95d021af3346de4e57d017f52ed96be02f4b08dd 100644
--- a/CMake/otbcli.sh.installtree.in
+++ b/CMake/otbcli.sh.installtree.in
@@ -17,9 +17,9 @@ else
 fi
 
 # works for install tree
-if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ]
+if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR@ ]
 then
-  ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@:$ITK_AUTOLOAD_PATH
+  ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR@:$ITK_AUTOLOAD_PATH
 fi
 
 # export it to make it available to otbApplicationLauncherCommandLine environment
diff --git a/CMake/otbgui.bat.installtree.in b/CMake/otbgui.bat.installtree.in
index af6ccdd807ca32a84ef1f9695209fe5ed6c8f537..499378dec177866fc19850917a775a35376c1ef7 100644
--- a/CMake/otbgui.bat.installtree.in
+++ b/CMake/otbgui.bat.installtree.in
@@ -15,8 +15,8 @@ if exist %CURRENT_SCRIPT_DIR%otbApplicationLauncherQt.exe (
 )
 
 :: works for install tree
-if exist %CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR_CM24@ (
-  set ITK_AUTOLOAD_PATH=%CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR_CM24@;%ITK_AUTOLOAD_PATH%
+if exist %CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR@ (
+  set ITK_AUTOLOAD_PATH=%CURRENT_SCRIPT_DIR%../@OTB_INSTALL_APP_DIR@;%ITK_AUTOLOAD_PATH%
 )
 
 set LC_NUMERIC=C
diff --git a/CMake/otbgui.sh.installtree.in b/CMake/otbgui.sh.installtree.in
index 21cd7c00051cd0d13a2a38221253ba305f3854ed..a30f07d9f5cb1d2f2cd12fa8a9e3ea6a611d50aa 100644
--- a/CMake/otbgui.sh.installtree.in
+++ b/CMake/otbgui.sh.installtree.in
@@ -17,9 +17,9 @@ else
 fi
 
 # use the default install tree path for applications
-if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ]
+if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR@ ]
 then
-  ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@:$ITK_AUTOLOAD_PATH
+  ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR@:$ITK_AUTOLOAD_PATH
 fi
 
 # export it to make it available to otbApplicationLauncherCommandLine environment
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b50d1534bd21e3ad97e5a8284bb7387b0d564d75..e5840ff78959378d8b67298aa5180563caa33572 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,31 +145,31 @@ SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 # OTB_INSTALL_NO_DOCUMENTATION - do not install documentation files
 
 IF(NOT OTB_INSTALL_BIN_DIR)
-  SET(OTB_INSTALL_BIN_DIR "/bin")
+  SET(OTB_INSTALL_BIN_DIR "bin")
 ENDIF(NOT OTB_INSTALL_BIN_DIR)
 
 IF(NOT OTB_INSTALL_LIB_DIR)
-  SET(OTB_INSTALL_LIB_DIR "/lib/otb")
+  SET(OTB_INSTALL_LIB_DIR "lib/otb")
 ENDIF(NOT OTB_INSTALL_LIB_DIR)
 
 IF(NOT OTB_INSTALL_APP_DIR)
-  SET(OTB_INSTALL_APP_DIR "/lib/otb/applications")
+  SET(OTB_INSTALL_APP_DIR "lib/otb/applications")
 ENDIF(NOT OTB_INSTALL_APP_DIR)
 
 IF(NOT OTB_INSTALL_PYTHON_DIR)
-  SET(OTB_INSTALL_PYTHON_DIR "/lib/otb/python")
+  SET(OTB_INSTALL_PYTHON_DIR "lib/otb/python")
 ENDIF(NOT OTB_INSTALL_PYTHON_DIR)
 
 IF(NOT OTB_INSTALL_JAVA_DIR)
-  SET(OTB_INSTALL_JAVA_DIR "/lib/otb/java")
+  SET(OTB_INSTALL_JAVA_DIR "lib/otb/java")
 ENDIF(NOT OTB_INSTALL_JAVA_DIR)
 
 IF(NOT OTB_INSTALL_DATA_DIR)
-  SET(OTB_INSTALL_DATA_DIR "/share/otb")
+  SET(OTB_INSTALL_DATA_DIR "share/otb")
 ENDIF(NOT OTB_INSTALL_DATA_DIR)
 
 IF(NOT OTB_INSTALL_INCLUDE_DIR)
-  SET(OTB_INSTALL_INCLUDE_DIR "/include/otb")
+  SET(OTB_INSTALL_INCLUDE_DIR "include/otb")
 ENDIF(NOT OTB_INSTALL_INCLUDE_DIR)
 
 IF(NOT OTB_INSTALL_PACKAGE_DIR)
@@ -200,18 +200,6 @@ ELSE(OTB_BUILD_SHARED_LIBS)
   ENDIF(OTB_INSTALL_NO_DEVELOPMENT)
 ENDIF(OTB_BUILD_SHARED_LIBS)
 
-# 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 "^/" "" OTB_INSTALL_LIB_DIR_CM24 "${OTB_INSTALL_LIB_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_APP_DIR_CM24 "${OTB_INSTALL_APP_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR_CM24 "${OTB_INSTALL_BIN_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR_CM24 "${OTB_INSTALL_INCLUDE_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_PACKAGE_DIR_CM24 "${OTB_INSTALL_PACKAGE_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_PYTHON_DIR_CM24 "${OTB_INSTALL_PYTHON_DIR}")
-STRING(REGEX REPLACE "^/" "" OTB_INSTALL_JAVA_DIR_CM24 "${OTB_INSTALL_JAVA_DIR}")
-
 INCLUDE(PreventInstallOnBuildTree)
 INCLUDE(CheckCXXSourceRuns)
 
@@ -390,11 +378,11 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
     ${OTB_SOURCE_DIR}/CMake/FindOpenThreads.cmake
     ${OTB_SOURCE_DIR}/CMake/OTBParseArguments.cmake
     ${OTB_SOURCE_DIR}/CMake/OTBWrapperMacros.cmake
-    DESTINATION ${OTB_INSTALL_PACKAGE_DIR_CM24}
+    DESTINATION ${OTB_INSTALL_PACKAGE_DIR}
     COMPONENT Development)
     
   INSTALL(FILES ${OTB_BINARY_DIR}/otbConfigure.h
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/ApplicationEngine/CMakeLists.txt b/Code/ApplicationEngine/CMakeLists.txt
index f97e7db9dca710cb550321e4974de475436035db..2357305679c0c3d4cc94848ab53262761733f957 100644
--- a/Code/ApplicationEngine/CMakeLists.txt
+++ b/Code/ApplicationEngine/CMakeLists.txt
@@ -16,16 +16,16 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBApplicationEngine
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/ApplicationEngine
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/ApplicationEngine
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
  
\ No newline at end of file
diff --git a/Code/BasicFilters/CMakeLists.txt b/Code/BasicFilters/CMakeLists.txt
index 2f9ce3af71e2ad78c308db2b899edbb731ab8734..3c7913198463a76dcd2d7932b5ded952ff9a1f92 100644
--- a/Code/BasicFilters/CMakeLists.txt
+++ b/Code/BasicFilters/CMakeLists.txt
@@ -11,15 +11,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBBasicFilters
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/BasicFilters
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/BasicFilters
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/ChangeDetection/CMakeLists.txt b/Code/ChangeDetection/CMakeLists.txt
index 18956db76103ffdfab5d4aef23a1b40546c9dc12..9374fe4b4c8aa4ca453d75519ba16264979d0975 100644
--- a/Code/ChangeDetection/CMakeLists.txt
+++ b/Code/ChangeDetection/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBChangeDetection
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/ChangeDetection
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/ChangeDetection
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index c635d09288b9a1ce43562fb86e3237f04904240e..6cbe999995d2689dd6e3ac033c3595aba2aa3cb3 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -38,9 +38,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBCommon
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -48,6 +48,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   FILE(GLOB __files3 "${CMAKE_CURRENT_BINARY_DIR}/*.h")
   INSTALL(FILES ${__files1} ${__files2} ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Common
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Common
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/DisparityMap/CMakeLists.txt b/Code/DisparityMap/CMakeLists.txt
index 55e07d9ee378744d5c65b5e6c2637363e7edddac..3d49ed8cde1dcf0933f4926e22bc80e9a5ef4aa2 100644
--- a/Code/DisparityMap/CMakeLists.txt
+++ b/Code/DisparityMap/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBDisparityMap
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/DisparityMap
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/DisparityMap
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/FeatureExtraction/CMakeLists.txt b/Code/FeatureExtraction/CMakeLists.txt
index 7eb071be20dd05ad7666e3935337de24cb9f0a97..d15c2976702e4a81c757ef2a643c2fcd1847a4e0 100644
--- a/Code/FeatureExtraction/CMakeLists.txt
+++ b/Code/FeatureExtraction/CMakeLists.txt
@@ -15,9 +15,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBFeatureExtraction
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -29,6 +29,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   ENDIF( NOT OTB_USE_SIFTFAST )
   
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/FeatureExtraction
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/FeatureExtraction
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Fusion/CMakeLists.txt b/Code/Fusion/CMakeLists.txt
index 988dbb5699d41f0f97fa63f7b0c7c2bba49a3e52..a13e34e005af880c2067a8bcbf656159dad49f6a 100644
--- a/Code/Fusion/CMakeLists.txt
+++ b/Code/Fusion/CMakeLists.txt
@@ -10,16 +10,16 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBFusion
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Fusion
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Fusion
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Fuzzy/CMakeLists.txt b/Code/Fuzzy/CMakeLists.txt
index 9d7c197986071ce47f5f1005f6bdfc7212097b82..f66bafa6f063e5d89c129768cc4e1a57ffd227af 100644
--- a/Code/Fuzzy/CMakeLists.txt
+++ b/Code/Fuzzy/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBFuzzy
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Fuzzy
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Fuzzy
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/GeospatialAnalysis/CMakeLists.txt b/Code/GeospatialAnalysis/CMakeLists.txt
index 8df46d5af27ca86e0d6f1f95f15e25acb26d2443..73a8cf61d62422f332856324f22c48438e2cf3d7 100644
--- a/Code/GeospatialAnalysis/CMakeLists.txt
+++ b/Code/GeospatialAnalysis/CMakeLists.txt
@@ -11,15 +11,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBGeospatialAnalysis
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/GeospatialAnalysis
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/GeospatialAnalysis
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index d4121a4fbde15fbd41a8bff9f3266933b30d244f..aaf7eef63a3362105f4ab39f9093749e3abeea58 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBGui
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Gui
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Gui
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Hyperspectral/CMakeLists.txt b/Code/Hyperspectral/CMakeLists.txt
index 825476232e7484efa8b2f3bd99beca5b0d429d71..5c3d92922ab34e8ad561ca720b4c4603ede1f3b3 100644
--- a/Code/Hyperspectral/CMakeLists.txt
+++ b/Code/Hyperspectral/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBHyperspectral
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Hyperspectral
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Hyperspectral
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index c5563bca2e5b16c630392fd7a2b6de45715696f8..e0ab06c98b4d37e5829b0d2790fb2b3dee5d221a 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -52,9 +52,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBIO
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -69,6 +69,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/IO
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/IO
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Learning/CMakeLists.txt b/Code/Learning/CMakeLists.txt
index 07c2915e076ac1bd35760dbda181407c1c900b5e..0844038f7251dd58ff325474b9dde9936d7e33ed 100644
--- a/Code/Learning/CMakeLists.txt
+++ b/Code/Learning/CMakeLists.txt
@@ -11,15 +11,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBLearning
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Learning
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Learning
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Markov/CMakeLists.txt b/Code/Markov/CMakeLists.txt
index 4732e122948026c5b941de50b29e2d3694841407..46a69d843db32846a2a439002a69f7bc77926010 100644
--- a/Code/Markov/CMakeLists.txt
+++ b/Code/Markov/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBMarkov
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Markov
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Markov
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/MultiScale/CMakeLists.txt b/Code/MultiScale/CMakeLists.txt
index 49b3d382689f664903f38cf61f988128e9dbafca..deece0a4b03f7b588786389ad5c6029152fa37ac 100644
--- a/Code/MultiScale/CMakeLists.txt
+++ b/Code/MultiScale/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBMultiScale
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/MultiScale
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/MultiScale
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/MultiTemporal/CMakeLists.txt b/Code/MultiTemporal/CMakeLists.txt
index 3835f6e6e3f3fc46dc7e90c7e6e3ed083135d829..507af0be2b154e1a30f6315e6f31fd9bfcebf15e 100644
--- a/Code/MultiTemporal/CMakeLists.txt
+++ b/Code/MultiTemporal/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBMultiTemporal
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/MultiTemporal
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/MultiTemporal
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/OBIA/CMakeLists.txt b/Code/OBIA/CMakeLists.txt
index 6f5f04c1b43d082227f07f567496d543899c6c4b..13b249f662a1a166900d683427811d5f6094a1cc 100644
--- a/Code/OBIA/CMakeLists.txt
+++ b/Code/OBIA/CMakeLists.txt
@@ -31,9 +31,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBOBIA
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -41,6 +41,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   FILE(GLOB __files3 "${CMAKE_CURRENT_BINARY_DIR}/*.h")
   INSTALL(FILES ${__files1} ${__files2} ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/OBIA
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/OBIA
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/ObjectDetection/CMakeLists.txt b/Code/ObjectDetection/CMakeLists.txt
index 0103a2f06d4cbb0a671c4f069d88a3550b806dae..61c9964932a81d4afd767fb3b4e49859c477027a 100644
--- a/Code/ObjectDetection/CMakeLists.txt
+++ b/Code/ObjectDetection/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBObjectDetection
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/ObjectDetection
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/ObjectDetection
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Projections/CMakeLists.txt b/Code/Projections/CMakeLists.txt
index 772742780d65cff7c2a5faaf2fc1a5e6bf33a3ef..758c907621fb40d97b4def48d778cc91e7bd9998 100644
--- a/Code/Projections/CMakeLists.txt
+++ b/Code/Projections/CMakeLists.txt
@@ -14,9 +14,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBProjections
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -27,6 +27,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
     LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbCoordinateToName.h" )
   ENDIF( NOT OTB_USE_CURL )
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Projections
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Projections
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Radiometry/CMakeLists.txt b/Code/Radiometry/CMakeLists.txt
index f280fb3030d44de59074b62fb763b229271eccff..18dfe40c7736158f0a41855281a95259b3cb1a21 100644
--- a/Code/Radiometry/CMakeLists.txt
+++ b/Code/Radiometry/CMakeLists.txt
@@ -12,15 +12,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBRadiometry
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Radiometry
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Radiometry
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/SARPolarimetry/CMakeLists.txt b/Code/SARPolarimetry/CMakeLists.txt
index 6447988e1f938fe3a36ccedc688ca7c9cc6bca21..6a08a14d15dcf1eb6561956d29b7cbb8fdab2e34 100644
--- a/Code/SARPolarimetry/CMakeLists.txt
+++ b/Code/SARPolarimetry/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBSARPolarimetry
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/SARPolarimetry
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/SARPolarimetry
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Segmentation/CMakeLists.txt b/Code/Segmentation/CMakeLists.txt
index 009142800bbcc81894ca3c14e7fbbdf357872a25..182349f614573159fae9cd16a2f5590746d3f5b9 100644
--- a/Code/Segmentation/CMakeLists.txt
+++ b/Code/Segmentation/CMakeLists.txt
@@ -12,15 +12,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBSegmentation
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Segmentation
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Segmentation
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
\ No newline at end of file
diff --git a/Code/Simulation/CMakeLists.txt b/Code/Simulation/CMakeLists.txt
index 0cf94837e9ff3e4f57a1a9bef1dd9ed018ff6f66..49887d620823cbc9ebaa3a5abff3b68a3a594d16 100644
--- a/Code/Simulation/CMakeLists.txt
+++ b/Code/Simulation/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBSimulation
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Simulation
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Simulation
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/SpatialReasoning/CMakeLists.txt b/Code/SpatialReasoning/CMakeLists.txt
index b5f8816e98bc7e37b9888db2c72b3f0206a0fca0..95bdb37a85e7cde0dc184a4c9694a31847c30283 100644
--- a/Code/SpatialReasoning/CMakeLists.txt
+++ b/Code/SpatialReasoning/CMakeLists.txt
@@ -10,16 +10,16 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBSpatialReasoning
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/SpatialReasoning
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/SpatialReasoning
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Testing/CMakeLists.txt b/Code/Testing/CMakeLists.txt
index 08d1e0c4e176c634d214bf8de795ced8d31f2a09..f76dc3c9c043c270a7280f6f8c56deab5d3867b7 100644
--- a/Code/Testing/CMakeLists.txt
+++ b/Code/Testing/CMakeLists.txt
@@ -18,15 +18,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBTesting
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Testing
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Testing
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
@@ -48,9 +48,9 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/IO
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/IO
     COMPONENT Development)
-  INSTALL(TARGETS otbTestDriver RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT Development)
+  INSTALL(TARGETS otbTestDriver RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 
diff --git a/Code/UtilitiesAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/CMakeLists.txt
index a38c2670cb3358e25654a6df392b0fc142349399..eebfb91ea600a32b7bc79502f2944e9ab78e369d 100644
--- a/Code/UtilitiesAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/CMakeLists.txt
@@ -7,6 +7,6 @@ ADD_SUBDIRECTORY(boost)
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/UtilitiesAdapters/CurlAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/CurlAdapters/CMakeLists.txt
index c26704d2d57c0f0911659158e3323a313c1cb750..c1f18a11469b3d489e78d1b0c96fd03ff8c33f51 100644
--- a/Code/UtilitiesAdapters/CurlAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/CurlAdapters/CMakeLists.txt
@@ -16,15 +16,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBCurlAdapters
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 # Note: no txx allowed here
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/CurlAdapters
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters/CurlAdapters
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/UtilitiesAdapters/OGRAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/OGRAdapters/CMakeLists.txt
index 1f7bf233840cd28cac01876dd41fde969cab4f32..cac95cc8b7a7d90ee7c91887ee702456a2a4c9f0 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/OGRAdapters/CMakeLists.txt
@@ -9,9 +9,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBOGRAdapters
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -21,6 +21,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   # INSTALL(FILES ${__files1}
   # INSTALL(FILES ${__files1} ${__files2}
   INSTALL(FILES ${__files1} ${__files2} ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/OGRAdapters
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters/OGRAdapters
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
index dff7656a3fd5f54eb8b9e35281c44c939ae1bd6b..7939c1104f9a0e4a11cc7445bdbdda202eae3bba 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
@@ -17,15 +17,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBOssimAdapters
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 # Note: no txx allowed here
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/OssimAdapters
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters/OssimAdapters
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/UtilitiesAdapters/TinyXMLAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/TinyXMLAdapters/CMakeLists.txt
index 9372be115ab44a08d41469ecf21fd957049ff6e9..8da242871364b96a90fd5a30a303050931444913 100644
--- a/Code/UtilitiesAdapters/TinyXMLAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/TinyXMLAdapters/CMakeLists.txt
@@ -1,5 +1,5 @@
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES otbTinyXML.h
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/TinyXMLAdapters
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters/TinyXMLAdapters
           COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/UtilitiesAdapters/boost/type_traits/CMakeLists.txt b/Code/UtilitiesAdapters/boost/type_traits/CMakeLists.txt
index 469d52e50267cc7e2452d5c16efca306fb872d19..28d95d81bf857947f6c7ebcb2a079921adf8e6a0 100644
--- a/Code/UtilitiesAdapters/boost/type_traits/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/boost/type_traits/CMakeLists.txt
@@ -5,6 +5,6 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   # INSTALL(FILES ${__files1}
   # INSTALL(FILES ${__files1} ${__files2}
   INSTALL(FILES ${__files1} ${__files2} ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/UtilitiesAdapters/boost/type_traits
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/UtilitiesAdapters/boost/type_traits
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index b0fcfa82b72ea1bba40e24fff676e8c11db70a1f..fd446398fa5471b3be5d6801eec79dcc4868b556 100644
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -10,16 +10,16 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBVisu
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Visu
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Visu
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Visualization/CMakeLists.txt b/Code/Visualization/CMakeLists.txt
index 0fba5c5247c19e5a2253f10b7ce5bcc7114fba41..df59398fbc9114795117c697083c446975682f63 100644
--- a/Code/Visualization/CMakeLists.txt
+++ b/Code/Visualization/CMakeLists.txt
@@ -15,9 +15,9 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS OTBVisualization
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
@@ -28,7 +28,7 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
     ${CMAKE_CURRENT_BINARY_DIR}/otbImageWidgetPackedManager.h
     ${CMAKE_CURRENT_BINARY_DIR}/otbImageWidgetSplittedManager.h
     ${CMAKE_CURRENT_BINARY_DIR}/otbMsgReporterGUI.h
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Visualization
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Visualization
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Visualization/Viewer/CMakeLists.txt b/Code/Visualization/Viewer/CMakeLists.txt
index dd9db07becfe828beb2856a93597e5ccd90b8445..333d6e4c21d1be4136fef1a4c9b0be9daaafe3f5 100644
--- a/Code/Visualization/Viewer/CMakeLists.txt
+++ b/Code/Visualization/Viewer/CMakeLists.txt
@@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(otbViewer OTBIO OTBCommon OTBVisualization)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbViewer
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
diff --git a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
index 03587644845e97fdbea0e244f53021296c334030..832c6f5c836dcf6ad03d55de424f7c3f8ed3dc5b 100644
--- a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
+++ b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
@@ -12,9 +12,9 @@ target_link_libraries(otbApplicationLauncherQt
                        ${QT_LIBRARIES})
                        
 install(TARGETS otbApplicationLauncherQt
-        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24})
+        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
 
 # Where we will install the script in the build tree
 get_target_property(CLI_OUPUT_DIR otbApplicationLauncherQt RUNTIME_OUTPUT_DIRECTORY)
@@ -41,7 +41,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.bat.installtree.in
                 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui.bat
                 @ONLY )
 install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui.bat
-        DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
+        DESTINATION ${OTB_INSTALL_BIN_DIR})
 
 else()
 configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.buildtree.in
@@ -54,7 +54,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.installtree.in
                 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
                 @ONLY )
 install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
-        DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
+        DESTINATION ${OTB_INSTALL_BIN_DIR})
 
 endif()
 
diff --git a/Code/Wrappers/CommandLine/CMakeLists.txt b/Code/Wrappers/CommandLine/CMakeLists.txt
index c2bb3d17c17ffa4feb9ace02624584f4a02a7935..a0f45b1668390ff6b4655d5f5d612329e890add0 100644
--- a/Code/Wrappers/CommandLine/CMakeLists.txt
+++ b/Code/Wrappers/CommandLine/CMakeLists.txt
@@ -8,9 +8,9 @@ IF(OTB_LIBRARY_PROPERTIES)
 ENDIF(OTB_LIBRARY_PROPERTIES)
 
 install(TARGETS OTBWrapperCommandLine
-        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24})
+        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
 
         
 
@@ -23,9 +23,9 @@ target_link_libraries(otbApplicationLauncherCommandLine
                        OTBApplicationEngine)
 
 install(TARGETS otbApplicationLauncherCommandLine
-        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24})
+        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
 
 # Where we will install the script in the build tree
 get_target_property(CLI_OUPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY)
@@ -50,7 +50,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.bat.installtree.in
                 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli.bat
                 @ONLY )
 install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli.bat
-        DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
+        DESTINATION ${OTB_INSTALL_BIN_DIR})
 
 else()
 configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.buildtree.in
@@ -63,6 +63,6 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.installtree.in
                 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
                 @ONLY )
 install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
-        DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
+        DESTINATION ${OTB_INSTALL_BIN_DIR})
 
 endif()
diff --git a/Code/Wrappers/QtWidget/CMakeLists.txt b/Code/Wrappers/QtWidget/CMakeLists.txt
index f44139d85a1651c00e425106cd12f938298a7342..686886c8fa759ab0d5244d46c72c574660b531e5 100644
--- a/Code/Wrappers/QtWidget/CMakeLists.txt
+++ b/Code/Wrappers/QtWidget/CMakeLists.txt
@@ -46,6 +46,6 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 
 install(TARGETS OTBWrapperQtWidget
-        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24}
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24})
+        RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
diff --git a/Code/Wrappers/SWIG/CMakeLists.txt b/Code/Wrappers/SWIG/CMakeLists.txt
index 6650529ed8790e1a690a0dd70083cc2e741264ad..6bd7ea4ff01dd0685336621899ea2e8ea418c47b 100644
--- a/Code/Wrappers/SWIG/CMakeLists.txt
+++ b/Code/Wrappers/SWIG/CMakeLists.txt
@@ -66,11 +66,11 @@ if ( OTB_WRAP_PYTHON )
     )
 
   install( TARGETS _otbApplication
-           DESTINATION ${OTB_INSTALL_PYTHON_DIR_CM24} )
+           DESTINATION ${OTB_INSTALL_PYTHON_DIR} )
 
   install( FILES ${CMAKE_CURRENT_BINARY_DIR}/otbApplication.py
                  ${CMAKE_CURRENT_BINARY_DIR}/otbApplication.pyc
-           DESTINATION ${OTB_INSTALL_PYTHON_DIR_CM24} )
+           DESTINATION ${OTB_INSTALL_PYTHON_DIR} )
 
 endif()
 
@@ -123,7 +123,7 @@ if ( OTB_WRAP_JAVA )
   # Prefer using OTB_INSTALL_JAVA_DIR which defaults to something that honors CMAKE_INSTALL_PREFIX
   # Using the system-wide Java extension dir usually require admin privileges,
   # and shall better be left to packagers.
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.otb.application.jar DESTINATION ${OTB_INSTALL_JAVA_DIR_CM24})
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.otb.application.jar DESTINATION ${OTB_INSTALL_JAVA_DIR})
 
 endif()
 
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 8c1f8cc6d7c733293fdc479d80fa0b9717f76833..e95e6aae101c506c989c15d9844bc5fbbc6e2c18 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -109,9 +109,9 @@ ELSE(OTB_BINARY_DIR)
     SET(OTB_INSTALL_INCLUDE_DIR "/include/otb")
   ENDIF(NOT OTB_INSTALL_INCLUDE_DIR)
 
-  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_LIB_DIR_CM24 "${OTB_INSTALL_LIB_DIR}")
-  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR_CM24 "${OTB_INSTALL_BIN_DIR}")
-  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR_CM24 "${OTB_INSTALL_INCLUDE_DIR}")
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_LIB_DIR "${OTB_INSTALL_LIB_DIR}")
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR "${OTB_INSTALL_BIN_DIR}")
+  STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR "${OTB_INSTALL_INCLUDE_DIR}")
 
   #Prevents conflicts with visual min/max function
   IF(WIN32)
diff --git a/Utilities/BGL/boost/CMakeLists.txt b/Utilities/BGL/boost/CMakeLists.txt
index 210c132bbecfdaa9184758e2772fb4587f55336f..c838648bc304dee85e2cad7d57236fb3e4ae039d 100644
--- a/Utilities/BGL/boost/CMakeLists.txt
+++ b/Utilities/BGL/boost/CMakeLists.txt
@@ -2,11 +2,11 @@
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   
   install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/BGL/
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/
           FILES_MATCHING PATTERN "*.hpp")
   
   install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/BGL/
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/
           FILES_MATCHING PATTERN "*.ipp")
           
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index e90e8000d7da85dae8d38bf86dc276472e4ab4f4..d0b24ef6eadd87f00a992963adf054242c699464 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -109,6 +109,6 @@ ENDIF(BUILD_TESTING)
 # Install the UseOTB.cmake file configured from the top-level.
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${OTB_BINARY_DIR}/Utilities/OTBConfig.cmake
-    DESTINATION ${OTB_INSTALL_PACKAGE_DIR_CM24}
+    DESTINATION ${OTB_INSTALL_PACKAGE_DIR}
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/FLTK/CMakeLists.txt b/Utilities/FLTK/CMakeLists.txt
index 760acb076da584317c9207f4fdf8dd0d21e163d5..fcad326417a664ef13a419e21ce77a03848d71b0 100644
--- a/Utilities/FLTK/CMakeLists.txt
+++ b/Utilities/FLTK/CMakeLists.txt
@@ -413,7 +413,7 @@ CONFIGURE_FILE("${FLTK_SOURCE_DIR}/fltk-config.in"
 #INSTALL_FILES(/include/FL FILES ${FLTK_HEADER_FILES})
 #INSTALL_FILES(/include/otb/Utilities/FLTK/FL FILES ${FLTK_HEADER_FILES})
 INSTALL(FILES ${FLTK_HEADER_FILES}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/FLTK/FL
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/FLTK/FL
     COMPONENT Development)
 
 #INSTALL_FILES(/lib/FLTK-${FLTK_VERSION} FILES "${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake")
diff --git a/Utilities/FLTK/jpeg/CMakeLists.txt b/Utilities/FLTK/jpeg/CMakeLists.txt
index 236c24c0eeecd7ce406ec05582003567a705fd3f..16f53a5646915faecebb7502c26cbed18f1f0980 100644
--- a/Utilities/FLTK/jpeg/CMakeLists.txt
+++ b/Utilities/FLTK/jpeg/CMakeLists.txt
@@ -33,7 +33,7 @@ jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
 
 ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
 INSTALL(TARGETS fltk_jpeg
-        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
diff --git a/Utilities/FLTK/png/CMakeLists.txt b/Utilities/FLTK/png/CMakeLists.txt
index c0b2b06c05c4c796e5aec8ecbdcbe87dcfa9f00d..970319f1e65e0f5c44a86a95380ddb19e4581033 100644
--- a/Utilities/FLTK/png/CMakeLists.txt
+++ b/Utilities/FLTK/png/CMakeLists.txt
@@ -20,9 +20,9 @@ SET(PNG_SRCS
 
 ADD_LIBRARY(fltk_png ${PNG_SRCS})
 INSTALL(TARGETS fltk_png
-        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
 
 IF(UNIX)
diff --git a/Utilities/FLTK/src/CMakeLists.txt b/Utilities/FLTK/src/CMakeLists.txt
index 1797ce6341a6a4c136315c73ce3ef0187e0ed066..28c45e16f14bea7c96f24fa78f3055878d49943f 100644
--- a/Utilities/FLTK/src/CMakeLists.txt
+++ b/Utilities/FLTK/src/CMakeLists.txt
@@ -183,9 +183,9 @@ ADD_LIBRARY(fltk ${CPPFILES} ${CFILES})
 # OTB Modifications
 #INSTALL_TARGETS(/lib fltk)
 INSTALL(TARGETS fltk
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
 SET_TARGET_PROPERTIES(fltk
   PROPERTIES
@@ -203,9 +203,9 @@ IF(OPENGL_FOUND)
 # OTB Modifications
 #  INSTALL_TARGETS(/lib fltk_gl)
   INSTALL(TARGETS fltk_gl
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
   TARGET_LINK_LIBRARIES(fltk_gl fltk ${OPENGL_LIBRARIES})
   SET_TARGET_PROPERTIES(fltk_gl
@@ -218,9 +218,9 @@ ADD_LIBRARY(fltk_forms ${FLCPPFILES})
 # OTB Modifications
 #INSTALL_TARGETS(/lib fltk_forms)
 INSTALL(TARGETS fltk_forms
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 TARGET_LINK_LIBRARIES(fltk_forms fltk)
 SET_TARGET_PROPERTIES(fltk_forms
   PROPERTIES
@@ -231,9 +231,9 @@ ADD_LIBRARY(fltk_images ${IMGCPPFILES})
 # OTB Modifications
 #INSTALL_TARGETS(/lib fltk_images)
 INSTALL(TARGETS fltk_images
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 TARGET_LINK_LIBRARIES(fltk_images fltk ${FLTK_PNG_LIBRARIES}
      ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES})
 SET_TARGET_PROPERTIES(fltk_images
diff --git a/Utilities/FLTK/zlib/CMakeLists.txt b/Utilities/FLTK/zlib/CMakeLists.txt
index af38b56d7700f69875dbbb9bb8ade86f14ee43f4..3b60c6eab6603aec0b3a07163667b6e73cf1ea86 100644
--- a/Utilities/FLTK/zlib/CMakeLists.txt
+++ b/Utilities/FLTK/zlib/CMakeLists.txt
@@ -12,8 +12,8 @@ inflate.c inftrees.c trees.c uncompr.c zutil.c
 
 ADD_LIBRARY(fltk_zlib ${ZLIB_SRCS})
 INSTALL(TARGETS fltk_zlib
-        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+        RUNTIME DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+        ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 
 
diff --git a/Utilities/InsightJournal/CMakeLists.txt b/Utilities/InsightJournal/CMakeLists.txt
index 37789ef75c47f60e6a1c3d28aa6e33db98a8cd8f..b72529fdb42dac5f9c4edf207ba130e6945c0593 100644
--- a/Utilities/InsightJournal/CMakeLists.txt
+++ b/Utilities/InsightJournal/CMakeLists.txt
@@ -10,15 +10,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS InsightJournal
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
   INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/InsightJournal
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/InsightJournal
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otb6S/CMakeLists.txt b/Utilities/otb6S/CMakeLists.txt
index 9ba2815c6b57da92777ec37b9c83d4fb3a7af201..ebf0726ccadf684f59a5bb2145cdd2100f195214 100644
--- a/Utilities/otb6S/CMakeLists.txt
+++ b/Utilities/otb6S/CMakeLists.txt
@@ -132,19 +132,19 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otb6S
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otb6S
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S
     COMPONENT Development)
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}//6SV1.0B/*.h")
   INSTALL(FILES ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otb6S/6SV1.0B
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S/6SV1.0B
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbconfigfile/CMakeLists.txt b/Utilities/otbconfigfile/CMakeLists.txt
index 245153a5e402a6c3524bcccd4e6eb6eea1be8f57..b66dfbe3b14252d3f58efad98a566b7650acd79b 100644
--- a/Utilities/otbconfigfile/CMakeLists.txt
+++ b/Utilities/otbconfigfile/CMakeLists.txt
@@ -13,14 +13,14 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbconfigfile
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${otbconfigfilelib_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbconfigfile
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbconfigfile
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbedison/CMakeLists.txt b/Utilities/otbedison/CMakeLists.txt
index 03f9b2a8b088884b1757c6cbae4dda386308ddc4..50c3135ea72b0cfe8abc65c264b0dc18df36b76d 100644
--- a/Utilities/otbedison/CMakeLists.txt
+++ b/Utilities/otbedison/CMakeLists.txt
@@ -53,13 +53,13 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbedison
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${EDISON_HEADERS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbedison
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbedison
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbexpat/CMakeLists.txt b/Utilities/otbexpat/CMakeLists.txt
index 9e9a82a81edf8967b0e68d916a67c122c731829d..4012343b8a426364382077adc594007e827ef3b0 100644
--- a/Utilities/otbexpat/CMakeLists.txt
+++ b/Utilities/otbexpat/CMakeLists.txt
@@ -71,20 +71,20 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbexpat
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   SET(__files     ${CMAKE_CURRENT_SOURCE_DIR}/otb_expat.h
                 ${CMAKE_CURRENT_SOURCE_DIR}/otb_expat_mangle.h)
   INSTALL(FILES ${__files}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbexpat
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat
     COMPONENT Development)
   SET(__files2    ${CMAKE_CURRENT_SOURCE_DIR}/lib/expat_external.h 
                 ${CMAKE_CURRENT_SOURCE_DIR}/lib/expat.h)
   INSTALL(FILES ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbexpat/lib
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat/lib
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbkml/CMakeLists.txt b/Utilities/otbkml/CMakeLists.txt
index e286a0a6c42d160d00715bc850a96bdba22aa79d..cb900fae6dfa041b8cc69df4d9e5f2c2a3e9495f 100644
--- a/Utilities/otbkml/CMakeLists.txt
+++ b/Utilities/otbkml/CMakeLists.txt
@@ -268,13 +268,13 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbkml
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/kml
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/
           FILES_MATCHING PATTERN "*.h")
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbliblas/CMakeLists.txt b/Utilities/otbliblas/CMakeLists.txt
index f16bfe8883329756795c43919bee174999ac9395..eba6d0463ffcc707fed9976b53d7762969f9ccd7 100644
--- a/Utilities/otbliblas/CMakeLists.txt
+++ b/Utilities/otbliblas/CMakeLists.txt
@@ -74,31 +74,31 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbliblas
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/*.hpp")
   INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbliblas/include/liblas
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas
     COMPONENT Development)
   FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/detail/*.hpp")
   INSTALL(FILES ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbliblas/include/liblas/detail
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas/detail
     COMPONENT Development)
   FILE(GLOB __files3 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/capi/*.h")
   INSTALL(FILES ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbliblas/include/liblas/capi
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas/capi
     COMPONENT Development)
   FILE(GLOB __files4 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/external/property_tree/*.hpp")
   INSTALL(FILES ${__files4}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbliblas/include/liblas/external/property_tree
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas/external/property_tree
     COMPONENT Development)
   FILE(GLOB __files5 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/external/property_tree/detail/*.hpp")
   INSTALL(FILES ${__files5}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbliblas/include/liblas/external/property_tree/detail
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas/external/property_tree/detail
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbmsinttypes/CMakeLists.txt b/Utilities/otbmsinttypes/CMakeLists.txt
index 95868b16a3bef2a0f1bbb64409b45d1f4f1b36ce..561034f3fb59f5ea4ab7ac7f23d3c9e3a521f227 100644
--- a/Utilities/otbmsinttypes/CMakeLists.txt
+++ b/Utilities/otbmsinttypes/CMakeLists.txt
@@ -2,7 +2,7 @@ IF(WIN32)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES inttypes.h stdint.h
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbmsinttypes
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbmsinttypes
           COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbmuparser/CMakeLists.txt b/Utilities/otbmuparser/CMakeLists.txt
index 8b900e9ff001ee90c0835de9be18a08206470163..65a2d3ee5dd79a5af823871602516a1bd98822df 100644
--- a/Utilities/otbmuparser/CMakeLists.txt
+++ b/Utilities/otbmuparser/CMakeLists.txt
@@ -8,15 +8,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbmuparser
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB OTBMUPARSER_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   LIST(REMOVE_ITEM OTBMUPARSER_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/muParserComplex.h")
   INSTALL(FILES ${OTBMUPARSER_HEADERS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbmuparser
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbmuparser
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt
index d3da0573e057ea8e4bb40ba49623de00be04e8d0..a21745556ccea5dcb37e5c95d322bec67fb25ff7 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt
@@ -44,14 +44,14 @@ LINK_DIRECTORIES(
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ${LIB_NAME}
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 #IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 #  INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
+#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
 #              COMPONENT Development)
 #ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
index 5d676632badace64cfc567e89ed64ed5db555c39..cf7a58cebac6f5be1d5c3fe9c7a7fc16b6c19969 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
@@ -36,15 +36,15 @@ LINK_DIRECTORIES(
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ${LIB_NAME}
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 # OpenThreads headers are not needed by OTB headers, so avoid exporting them
 #IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 #  INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
+#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
 #              COMPONENT Development)
 #ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
index 8d78745f189e5752173338db1e70067705911ae4..6abcad160f91ea6444c0af530c458039a3a967b0 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
@@ -35,15 +35,15 @@ LINK_DIRECTORIES(
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS ${LIB_NAME}
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 # OpenThreads headers are not needed by OTB headers, so avoid exporting them
 #IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 #  INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
+#              DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
 #              COMPONENT Development)
 #ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index ff7ad57b0b662ba6d1514e4626ec51c416ef4843..9030bfd82ab990ec283bd5ae1dc95f5275c21de2 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -119,9 +119,9 @@ IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
 
   IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbossim
-          RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-          LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-          ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+          RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+          LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+          ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 77ce02158874d5397ee3eb11655467eb748971c0..872f5f97b8d9ada0a8165b0cec85bfcda527c63e 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -49,7 +49,7 @@ SET_TARGET_PROPERTIES(otbossimplugins
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbossimplugins
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
diff --git a/Utilities/otbsiftfast/CMakeLists.txt b/Utilities/otbsiftfast/CMakeLists.txt
index d0eca9cd8503b70f39166fa321b1e091bfda8499..93ad1af50603e419d891f8f484dea9e7b81cd30e 100644
--- a/Utilities/otbsiftfast/CMakeLists.txt
+++ b/Utilities/otbsiftfast/CMakeLists.txt
@@ -235,13 +235,13 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbsiftfast
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES siftfast.h 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbsiftfast
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsiftfast
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
\ No newline at end of file
diff --git a/Utilities/otbsvm/CMakeLists.txt b/Utilities/otbsvm/CMakeLists.txt
index 12e8a7d128323e85aed9cfc0bd9c961580992e5f..a6a8ef3f0e56dc6da22342cc9297275d82b78f39 100644
--- a/Utilities/otbsvm/CMakeLists.txt
+++ b/Utilities/otbsvm/CMakeLists.txt
@@ -19,15 +19,15 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbsvm
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES ${__files}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbsvm
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsvm
     COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/tinyXMLlib/CMakeLists.txt b/Utilities/tinyXMLlib/CMakeLists.txt
index 8182caefddd8faa6bcfdf046b643758cbada5200..19e25dd101d94631f2f400cd03c6e9023b924afe 100644
--- a/Utilities/tinyXMLlib/CMakeLists.txt
+++ b/Utilities/tinyXMLlib/CMakeLists.txt
@@ -9,14 +9,14 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
 
 IF(NOT OTB_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS otbtinyXML
-    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+    RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+    LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+    ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
   INSTALL(FILES ${tinyXMLlib_HDRS}
-          DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/tinyXMLlib
+          DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/tinyXMLlib
           COMPONENT Development)
 ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)