From b471469dd3ec2de3db9fc5eb1c6cecfe8d550b53 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Wed, 15 Apr 2009 18:52:29 +0200
Subject: [PATCH] ENH: Change INSTALL management in OTB CMakeLists.txt and
 subdirs. Necessary for CPack capability

---
 CMakeLists.txt                                | 140 ++++++++++++++++--
 Code/BasicFilters/CMakeLists.txt              |  24 +--
 Code/ChangeDetection/CMakeLists.txt           |  24 +--
 Code/Common/CMakeLists.txt                    |  25 ++--
 Code/DisparityMap/CMakeLists.txt              |  24 +--
 Code/FeatureExtraction/CMakeLists.txt         |  24 +--
 Code/Fusion/CMakeLists.txt                    |  25 ++--
 Code/Gui/CMakeLists.txt                       |  32 ++--
 Code/IO/CMakeLists.txt                        |  23 ++-
 Code/Learning/CMakeLists.txt                  |  25 ++--
 Code/Markov/CMakeLists.txt                    |  24 +--
 Code/MultiScale/CMakeLists.txt                |  24 +--
 Code/Projections/CMakeLists.txt               |  30 ++--
 Code/Radiometry/CMakeLists.txt                |  24 +--
 Code/SARPolarimetry/CMakeLists.txt            |  24 +--
 Code/SpatialReasoning/CMakeLists.txt          |  24 +--
 Code/Visu/CMakeLists.txt                      |  25 ++--
 Code/Visualization/CMakeLists.txt             |  28 ++--
 Utilities/BGL/boost/CMakeLists.txt            |  12 +-
 Utilities/CMakeLists.txt                      |   6 +-
 Utilities/InsightJournal/CMakeLists.txt       |  23 ++-
 Utilities/dxflib/CMakeLists.txt               |  21 ++-
 Utilities/otb6S/CMakeLists.txt                |  29 ++--
 Utilities/otbedison/CMakeLists.txt            |  20 ++-
 Utilities/otbexpat/CMakeLists.txt             |  36 ++---
 Utilities/otbgalib/CMakeLists.txt             |  28 ++--
 Utilities/otbkml/CMakeLists.txt               |  59 +++++---
 Utilities/otbliblas/CMakeLists.txt            |  26 ++--
 Utilities/otbopenjpeg/CMakeLists.txt          |   6 +-
 .../otbopenjpeg/libopenjpeg/CMakeLists.txt    |  18 ++-
 .../src/OpenThreads/pthreads/CMakeLists.txt   |  32 ++--
 .../src/OpenThreads/sproc/CMakeLists.txt      |  31 ++--
 .../src/OpenThreads/win32/CMakeLists.txt      |  30 ++--
 Utilities/otbossim/include/CMakeLists.txt     |  33 +++--
 Utilities/otbossim/src/ossim/CMakeLists.txt   |  13 +-
 Utilities/otbossimplugins/CMakeLists.txt      |  26 ++--
 Utilities/otbsiftfast/CMakeLists.txt          |  23 ++-
 Utilities/otbsvm/CMakeLists.txt               |  28 ++--
 Utilities/tinyXMLlib/CMakeLists.txt           |  19 ++-
 otbGenerateOTBConfig.cmake                    |  16 +-
 40 files changed, 692 insertions(+), 412 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 250eee8475..ea93adf3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,8 +70,8 @@ SET(OTB_VERSION_PATCH "0")
 SET(OTB_VERSION_STRING "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}")
 
 
-# => Comment for OTB 2.6.0
-OPTION(BUILD_TESTING "Build testing." OFF)
+# => Comment for OTB 3.0.0
+#OPTION(BUILD_TESTING "Build testing." OFF)
 
 #-----------------------------------------------------------------------------
 # OTB build configuration options.
@@ -84,6 +84,16 @@ OPTION(BUILD_SHARED_LIBS "Build OTB with shared libraries." ON)
 ENDIF(WIN32)
 SET(OTB_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 
+IF(NOT OTB_NO_LIBRARY_VERSION)
+  # This setting of SOVERSION assumes that any API change
+  # will increment either the minor or major version number of OTB.
+  SET(OTB_LIBRARY_PROPERTIES 
+      VERSION   "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}"
+      SOVERSION "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}"
+     )
+ENDIF(NOT OTB_NO_LIBRARY_VERSION)
+
+
 #-----------------------------------------------------------------------------
 
 # Case for release 2.2.1
@@ -456,6 +466,90 @@ ENDIF(GDAL_HAS_OGR)
 # End connections whith external libraries
 #-------------------------------
 
+#-----------------------------------------------------------------------------
+# Installation vars.
+# OTB_INSTALL_BIN_DIR          - binary dir (executables)
+# OTB_INSTALL_LIB_DIR          - library dir (libs)
+# OTB_INSTALL_DATA_DIR         - share dir (say, examples, data, etc)
+# OTB_INSTALL_INCLUDE_DIR      - include dir (headers)
+# OTB_INSTALL_PACKAGE_DIR      - package/export configuration files
+# OTB_INSTALL_NO_DEVELOPMENT   - do not install development files
+# OTB_INSTALL_NO_RUNTIME       - do not install runtime files
+# OTB_INSTALL_NO_DOCUMENTATION - do not install documentation files
+
+IF(NOT OTB_INSTALL_BIN_DIR)
+  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")
+ENDIF(NOT OTB_INSTALL_LIB_DIR)
+
+IF(NOT OTB_INSTALL_DATA_DIR)
+  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")
+ENDIF(NOT OTB_INSTALL_INCLUDE_DIR)
+
+IF(NOT OTB_INSTALL_PACKAGE_DIR)
+  SET(OTB_INSTALL_PACKAGE_DIR ${OTB_INSTALL_LIB_DIR}
+    CACHE INTERNAL "")
+ENDIF(NOT OTB_INSTALL_PACKAGE_DIR)
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  SET(OTB_INSTALL_NO_DEVELOPMENT 0)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
+IF(NOT OTB_INSTALL_NO_RUNTIME)
+  SET(OTB_INSTALL_NO_RUNTIME 0)
+ENDIF(NOT OTB_INSTALL_NO_RUNTIME)
+
+IF(NOT OTB_INSTALL_NO_DOCUMENTATION)
+  SET(OTB_INSTALL_NO_DOCUMENTATION 0)
+ENDIF(NOT OTB_INSTALL_NO_DOCUMENTATION)
+
+SET(OTB_INSTALL_NO_LIBRARIES)
+IF(OTB_BUILD_SHARED_LIBS)
+  IF(OTB_INSTALL_NO_RUNTIME AND OTB_INSTALL_NO_DEVELOPMENT)
+    SET(OTB_INSTALL_NO_LIBRARIES 1)
+  ENDIF(OTB_INSTALL_NO_RUNTIME AND OTB_INSTALL_NO_DEVELOPMENT)
+ELSE(OTB_BUILD_SHARED_LIBS)
+  IF(OTB_INSTALL_NO_DEVELOPMENT)
+    SET(OTB_INSTALL_NO_LIBRARIES 1)
+  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_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_DOXYGEN_DIR_CM24 "${OTB_INSTALL_DOXYGEN_DIR}")
+STRING(REGEX REPLACE "^/" "" OTB_INSTALL_TCL_DIR_CM24 "${OTB_INSTALL_TCL_DIR}")
+STRING(REGEX REPLACE "^/" "" OTB_INSTALL_JAVA_DIR_CM24 "${OTB_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)
+  STRING(TOLOWER "${OTB_BINARY_DIR}" _BUILD)
+ELSE(WIN32 OR APPLE OR UNIX)
+  SET(_PREFIX "${CMAKE_INSTALL_PREFIX}")
+  SET(_BUILD "${OTB_BINARY_DIR}")
+ENDIF(WIN32 OR APPLE OR UNIX)
+IF("${_PREFIX}" STREQUAL "${_BUILD}")
+  MESSAGE(FATAL_ERROR
+    "The current CMAKE_INSTALL_PREFIX points at the build tree:\n"
+    "  ${CMAKE_INSTALL_PREFIX}\n"
+    "This is not supported."
+    )
+ENDIF("${_PREFIX}" STREQUAL "${_BUILD}")
+
+
 # The fluid-generated fltk sources have many warnings.  This macro
 # will disable warnings for the generated files on some compilers.
 MACRO(OTB_DISABLE_FLTK_GENERATED_WARNINGS files)
@@ -520,8 +614,8 @@ INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 # MESSAGE(FATAL_ERROR ...) commands are invoked.
 INCLUDE(${CMAKE_ROOT}/Modules/Dart.cmake)
 MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
+ENABLE_TESTING()
 IF(BUILD_TESTING)
-  ENABLE_TESTING()
   SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
   MARK_AS_ADVANCED(BUILDNAME)
 ENDIF(BUILD_TESTING)
@@ -740,13 +834,13 @@ INCLUDE_DIRECTORIES(
 
 #-----------------------------------------------------------------------------
 # Uninstall cmake use to uninstall OTB.
-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMake/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
+#    CONFIGURE_FILE(
+#      "${CMAKE_CURRENT_SOURCE_DIR}/CMake/cmake_uninstall.cmake.in"
+#      "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+#      IMMEDIATE @ONLY)
 
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+#    ADD_CUSTOM_TARGET(uninstall
+#      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 #-----------------------------------------------------------------------------
 # Help other projects use OTB.
@@ -755,10 +849,21 @@ ADD_CUSTOM_TARGET(uninstall
 CONFIGURE_FILE(${OTB_SOURCE_DIR}/UseOTB.cmake.in
                ${OTB_BINARY_DIR}/UseOTB.cmake COPYONLY IMMEDIATE)
 
+
 # Save the compiler settings so another project can import them.
 INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
 CMAKE_EXPORT_BUILD_SETTINGS(${OTB_BINARY_DIR}/OTBBuildSettings.cmake)
-INSTALL_FILES(/lib/otb .cmake OTBBuildSettings)
+#INSTALL_FILES(/lib/otb .cmake OTBBuildSettings)
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES
+    ${OTB_BINARY_DIR}/OTBBuildSettings.cmake
+    ${OTB_BINARY_DIR}/OTBLibraryDepends.cmake
+    ${OTB_BINARY_DIR}/UseOTB.cmake
+    DESTINATION ${OTB_INSTALL_PACKAGE_DIR_CM24}
+    COMPONENT Development
+    )
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 # Save library dependencies.
 EXPORT_LIBRARY_DEPENDENCIES(${OTB_BINARY_DIR}/OTBLibraryDepends.cmake)
@@ -766,9 +871,15 @@ EXPORT_LIBRARY_DEPENDENCIES(${OTB_BINARY_DIR}/OTBLibraryDepends.cmake)
 # Create the OTBConfig.cmake file containing the OTB configuration.
 INCLUDE (${OTB_SOURCE_DIR}/otbGenerateOTBConfig.cmake)
 
-# Install some files.
-INSTALL_FILES(/include/otb .h otbConfigure)
-INSTALL_FILES(/lib/otb .cmake UseOTB OTBLibraryDepends OTBConfig )
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES ${OTB_BINARY_DIR}/otbConfigure.h
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}
+    COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
+
+#INSTALL_FILES(/include/otb .h otbConfigure)
+#INSTALL_FILES(/lib/otb .cmake UseOTB OTBLibraryDepends OTBConfig )
 
 #-----------------------------------------------------------------------------
 # Add compiler flags OTB needs to work on this platform.  This must be
@@ -784,8 +895,7 @@ SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${OTB_REQUIRED_LINK_
 # Set up CPack support, to be able to distribute OTB binary packages. It will
 # be particulary useful to distributed prebuilt OTB.
 #
-
-#INCLUDE(InstallRequiredSystemLibraries)
+INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_NAME "OTB" CACHE STRING "Package name")
 MARK_AS_ADVANCED(CPACK_PACKAGE_NAME)
diff --git a/Code/BasicFilters/CMakeLists.txt b/Code/BasicFilters/CMakeLists.txt
index b29bf6f312..0b50e4f2bb 100644
--- a/Code/BasicFilters/CMakeLists.txt
+++ b/Code/BasicFilters/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBBasicFilters_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBBasicFilters ${OTBBasicFilters_SRCS})
 TARGET_LINK_LIBRARIES (OTBBasicFilters OTBCommon ITKBasicFilters otbedison)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBBasicFilters PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBBasicFilters
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/BasicFilters
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/ChangeDetection/CMakeLists.txt b/Code/ChangeDetection/CMakeLists.txt
index d5516f1b52..18956db761 100644
--- a/Code/ChangeDetection/CMakeLists.txt
+++ b/Code/ChangeDetection/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBChangeDetection_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBChangeDetection ${OTBChangeDetection_SRCS})
 TARGET_LINK_LIBRARIES (OTBChangeDetection OTBCommon ITKStatistics)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBChangeDetection PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBChangeDetection
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/ChangeDetection
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index 9bf7be40fb..13f6987f3a 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -4,16 +4,21 @@ FILE(GLOB OTBCommon_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBCommon ${OTBCommon_SRCS})
 TARGET_LINK_LIBRARIES (OTBCommon ITKAlgorithms ITKStatistics ITKCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBCommon PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBCommon
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Common
+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}/Common
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/DisparityMap/CMakeLists.txt b/Code/DisparityMap/CMakeLists.txt
index de5e3731d5..55e07d9ee3 100644
--- a/Code/DisparityMap/CMakeLists.txt
+++ b/Code/DisparityMap/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBDisparityMap_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBDisparityMap ${OTBDisparityMap_SRCS})
 TARGET_LINK_LIBRARIES (OTBDisparityMap OTBCommon itkvnl)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBDisparityMap PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBDisparityMap
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/DisparityMap
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/FeatureExtraction/CMakeLists.txt b/Code/FeatureExtraction/CMakeLists.txt
index 36ce2adb93..5b3f420ff7 100644
--- a/Code/FeatureExtraction/CMakeLists.txt
+++ b/Code/FeatureExtraction/CMakeLists.txt
@@ -5,15 +5,21 @@ FILE(GLOB OTBFeatureExtraction_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBFeatureExtraction ${OTBFeatureExtraction_SRCS})
 TARGET_LINK_LIBRARIES (OTBFeatureExtraction OTBCommon otbsiftfast)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBFeatureExtraction PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBFeatureExtraction
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/FeatureExtraction
+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}/FeatureExtraction
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Fusion/CMakeLists.txt b/Code/Fusion/CMakeLists.txt
index f561e22fd3..988dbb5699 100644
--- a/Code/Fusion/CMakeLists.txt
+++ b/Code/Fusion/CMakeLists.txt
@@ -4,15 +4,22 @@ FILE(GLOB OTBFusion_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBFusion ${OTBFusion_SRCS})
 TARGET_LINK_LIBRARIES (OTBFusion OTBCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBFusion PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBFusion
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Fusion
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
diff --git a/Code/Gui/CMakeLists.txt b/Code/Gui/CMakeLists.txt
index 05efe68a95..d60c77ed64 100644
--- a/Code/Gui/CMakeLists.txt
+++ b/Code/Gui/CMakeLists.txt
@@ -13,19 +13,21 @@ ENDIF(APPLE AND BUILD_SHARED_LIBS)
 
 ADD_LIBRARY(OTBGui ${OTBGui_SRCS})
 TARGET_LINK_LIBRARIES (OTBGui OTBCommon ${FLTK_LIBRARIES})
-
-INSTALL(TARGETS OTBGui
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT 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}/Gui
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBGui PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index f7a05e8ad0..6166f12612 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -35,11 +35,17 @@ ENDIF( OTB_COMPILE_JPEG2000 )
 IF( OTB_USE_CURL )
     TARGET_LINK_LIBRARIES (OTBIO ${CURL_LIBRARY})
 ENDIF( OTB_USE_CURL )
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBIO PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBIO
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
@@ -55,7 +61,12 @@ IF(NOT OTB_COMPILE_JPEG2000)
    LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbJpeg2000ImageIO.h" )
 ENDIF(NOT OTB_COMPILE_JPEG2000)
 
-INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/IO
+
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Learning/CMakeLists.txt b/Code/Learning/CMakeLists.txt
index 0d764895c5..07c2915e07 100644
--- a/Code/Learning/CMakeLists.txt
+++ b/Code/Learning/CMakeLists.txt
@@ -5,16 +5,21 @@ FILE(GLOB OTBLearning_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBLearning ${OTBLearning_SRCS})
 TARGET_LINK_LIBRARIES (OTBLearning OTBCommon otbsvm)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBLearning PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBLearning
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Learning
+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
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Markov/CMakeLists.txt b/Code/Markov/CMakeLists.txt
index d0da5bea79..4732e12294 100644
--- a/Code/Markov/CMakeLists.txt
+++ b/Code/Markov/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBMarkov_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBMarkov ${OTBMarkov_SRCS})
 TARGET_LINK_LIBRARIES (OTBMarkov OTBCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBMarkov PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBMarkov
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Markov
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/MultiScale/CMakeLists.txt b/Code/MultiScale/CMakeLists.txt
index 12b99ac6e9..49b3d38268 100644
--- a/Code/MultiScale/CMakeLists.txt
+++ b/Code/MultiScale/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBMultiScale_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBMultiScale ${OTBMultiScale_SRCS})
 TARGET_LINK_LIBRARIES (OTBMultiScale OTBCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBMultiScale PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBMultiScale
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/MultiScale
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Projections/CMakeLists.txt b/Code/Projections/CMakeLists.txt
index f0424a0ec4..f27af0b653 100644
--- a/Code/Projections/CMakeLists.txt
+++ b/Code/Projections/CMakeLists.txt
@@ -6,21 +6,25 @@ TARGET_LINK_LIBRARIES(OTBProjections OTBIO)
 IF( OTB_USE_CURL )
     TARGET_LINK_LIBRARIES (OTBProjections ${CURL_LIBRARY})
 ENDIF( OTB_USE_CURL )
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBProjections PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBProjections
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
-
-IF( NOT OTB_USE_CURL )
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+  FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+  IF( NOT OTB_USE_CURL )
     LIST(REMOVE_ITEM __files1 "${CMAKE_CURRENT_SOURCE_DIR}/otbPlaceNameToLonLat.h" )
     LIST(REMOVE_ITEM __files2 "${CMAKE_CURRENT_SOURCE_DIR}/otbPlaceNameToLonLat.txx" )
-ENDIF( NOT OTB_USE_CURL )
-
-INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Projections
+  ENDIF( NOT OTB_USE_CURL )
+  INSTALL(FILES ${__files1} ${__files2}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Projections
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/Radiometry/CMakeLists.txt b/Code/Radiometry/CMakeLists.txt
index d64315908e..db3ff67df4 100644
--- a/Code/Radiometry/CMakeLists.txt
+++ b/Code/Radiometry/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBRadiometry_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBRadiometry ${OTBRadiometry_SRCS})
 TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBRadiometry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBRadiometry
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Radiometry
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/SARPolarimetry/CMakeLists.txt b/Code/SARPolarimetry/CMakeLists.txt
index 18fc94dee0..6447988e1f 100644
--- a/Code/SARPolarimetry/CMakeLists.txt
+++ b/Code/SARPolarimetry/CMakeLists.txt
@@ -4,15 +4,21 @@ FILE(GLOB OTBSARPOLARIMETRY_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBSARPolarimetry ${OTBSARPOLARIMETRY_SRCS})
 TARGET_LINK_LIBRARIES (OTBSARPolarimetry OTBCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBSARPolarimetry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBSARPolarimetry
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/SARPolarimetry
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Code/SpatialReasoning/CMakeLists.txt b/Code/SpatialReasoning/CMakeLists.txt
index e19063b0e8..b5f8816e98 100644
--- a/Code/SpatialReasoning/CMakeLists.txt
+++ b/Code/SpatialReasoning/CMakeLists.txt
@@ -4,16 +4,22 @@ FILE(GLOB OTBSpatialReasoning_SRCS "*.cxx" )
 
 ADD_LIBRARY(OTBSpatialReasoning ${OTBSpatialReasoning_SRCS})
 TARGET_LINK_LIBRARIES (OTBSpatialReasoning OTBCommon)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBSpatialReasoning PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBSpatialReasoning
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/SpatialReasoning
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Code/Visu/CMakeLists.txt b/Code/Visu/CMakeLists.txt
index f670c204e5..43d6b4d11c 100644
--- a/Code/Visu/CMakeLists.txt
+++ b/Code/Visu/CMakeLists.txt
@@ -11,15 +11,22 @@ ENDIF(APPLE AND BUILD_SHARED_LIBS)
 
 ADD_LIBRARY(OTBVisu ${OTBVisu_SRCS})
 TARGET_LINK_LIBRARIES (OTBVisu OTBGui OTBCommon ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBVisu PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBVisu
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-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}/Visu
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
diff --git a/Code/Visualization/CMakeLists.txt b/Code/Visualization/CMakeLists.txt
index 420c9d21ca..6b79675d60 100644
--- a/Code/Visualization/CMakeLists.txt
+++ b/Code/Visualization/CMakeLists.txt
@@ -13,17 +13,23 @@ FLTK_WRAP_UI(OTBVisualization otbImageWidgetPackedManager.fl otbImageWidgetSplit
 
 ADD_LIBRARY(OTBVisualization ${OTBVisualization_SRCS} ${OTBVisualization_FLTK_UI_SRCS})
 TARGET_LINK_LIBRARIES (OTBVisualization OTBGui OTBCommon ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES})
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(OTBVisualization PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS OTBVisualization
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
-FILE(GLOB __files3 "${CMAKE_CURRENT_BINARY_DIR}/*.h")
-FILE(GLOB __files4 "${CMAKE_CURRENT_SOURCE_DIR}/*.fl")
-
-INSTALL(FILES ${__files1} ${__files2} ${__files3} ${__files4}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Visualization
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+  FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+  FILE(GLOB __files3 "${CMAKE_CURRENT_BINARY_DIR}/*.h")
+  FILE(GLOB __files4 "${CMAKE_CURRENT_SOURCE_DIR}/*.fl")
+  INSTALL(FILES ${__files1} ${__files2}  ${__files3}  ${__files4}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Visualization
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/BGL/boost/CMakeLists.txt b/Utilities/BGL/boost/CMakeLists.txt
index 7ea87773ba..8eb8d2ce6d 100644
--- a/Utilities/BGL/boost/CMakeLists.txt
+++ b/Utilities/BGL/boost/CMakeLists.txt
@@ -1,7 +1,9 @@
-FILE(GLOB_RECURSE __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-FILE(GLOB_RECURSE __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
-FILE(GLOB_RECURSE __files3 "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
 
-INSTALL(FILES ${__files1} ${__files2} ${__files3}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/boost
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  FILE(GLOB_RECURSE __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+  FILE(GLOB_RECURSE __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+  FILE(GLOB_RECURSE __files3 "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
+  INSTALL(FILES ${__files1} ${__files2} ${__files3}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/BGL/boost
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 482a6f3bcc..071f4350a8 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -39,4 +39,8 @@ ENDIF(BUILD_TESTING)
 
 #-----------------------------------------------------------------------------
 # Install the UseOTB.cmake file configured from the top-level.
-INSTALL_FILES(/lib/otb ".cmake" "OTBConfig")
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES ${OTB_BINARY_DIR}/Utilities/OTBConfig.cmake
+    DESTINATION ${OTB_INSTALL_PACKAGE_DIR_CM24}
+    COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/InsightJournal/CMakeLists.txt b/Utilities/InsightJournal/CMakeLists.txt
index 973a8528a9..37789ef75c 100644
--- a/Utilities/InsightJournal/CMakeLists.txt
+++ b/Utilities/InsightJournal/CMakeLists.txt
@@ -4,14 +4,21 @@ FILE(GLOB InsightJournal_SRCS "*.cxx" )
 ADD_LIBRARY(InsightJournal ${InsightJournal_SRCS})
 TARGET_LINK_LIBRARIES (InsightJournal ITKCommon)
 
-INSTALL(TARGETS InsightJournal
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(InsightJournal PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-INSTALL(FILES ${__files1} ${__files2}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/InsightJournal
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/dxflib/CMakeLists.txt b/Utilities/dxflib/CMakeLists.txt
index cd5684b419..e4df2ad34b 100644
--- a/Utilities/dxflib/CMakeLists.txt
+++ b/Utilities/dxflib/CMakeLists.txt
@@ -1,15 +1,22 @@
 PROJECT(dxflib)
 
 FILE(GLOB dxflib_SRCS "*.cpp")
-FILE(GLOB dxflib_HDRS "*.h")
 ADD_LIBRARY(dxf ${dxflib_SRCS})
 TARGET_LINK_LIBRARIES(dxf)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(dxf PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS dxf
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+IF(NOT OTB_INSTALL_NO_LIBRARIES)
+  INSTALL(TARGETS dxf
+    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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-INSTALL(FILES ${dxflib_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/dxflib
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  FILE(GLOB dxflib_HDRS "*.h")
+  INSTALL(FILES ${dxflib_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/dxflib
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otb6S/CMakeLists.txt b/Utilities/otb6S/CMakeLists.txt
index 7c9331502a..5fff181a50 100644
--- a/Utilities/otb6S/CMakeLists.txt
+++ b/Utilities/otb6S/CMakeLists.txt
@@ -121,23 +121,28 @@ IF(CMAKE_COMPILER_IS_GNUCC)
 #  ENDIF(WIN32)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-
-INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otb6S
-    COMPONENT Development)
-
 IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
 ADD_LIBRARY(otb6S ${LIBF2C_SRCS} ${OTB6S_SRCS} ${OTB6S_MAIN_SRCS})
-
 IF(UNIX)
     TARGET_LINK_LIBRARIES (otb6S m)
 ENDIF(UNIX)
-
-INSTALL(TARGETS otb6S
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otb6S PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+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
+    COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
 
diff --git a/Utilities/otbedison/CMakeLists.txt b/Utilities/otbedison/CMakeLists.txt
index 02375f6a19..03f9b2a8b0 100644
--- a/Utilities/otbedison/CMakeLists.txt
+++ b/Utilities/otbedison/CMakeLists.txt
@@ -47,13 +47,19 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 
 ADD_LIBRARY(otbedison ${EDISON_SOURCE})
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbedison PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS otbedison
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-INSTALL(FILES ${EDISON_HEADERS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbedison
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES ${EDISON_HEADERS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbedison
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbexpat/CMakeLists.txt b/Utilities/otbexpat/CMakeLists.txt
index bfee381e4d..9e9a82a81e 100644
--- a/Utilities/otbexpat/CMakeLists.txt
+++ b/Utilities/otbexpat/CMakeLists.txt
@@ -65,24 +65,26 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_expat_config.h.in
 
 ADD_LIBRARY(otbexpat ${EXPAT_SRCS} )
 #TARGET_LINK_LIBRARIES (otbkml)
-
-
-INSTALL(TARGETS otbexpat
-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(__files     ${CMAKE_CURRENT_SOURCE_DIR}/otb_expat.h
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbexpat PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+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}/Utilities/otbexpat
+  INSTALL(FILES ${__files}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbexpat
     COMPONENT Development)
-
-SET(__files2    ${CMAKE_CURRENT_SOURCE_DIR}/lib/expat_external.h 
+  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}/Utilities/otbexpat/lib
+  INSTALL(FILES ${__files2}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbexpat/lib
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbgalib/CMakeLists.txt b/Utilities/otbgalib/CMakeLists.txt
index 85e9016743..a08fd4598f 100644
--- a/Utilities/otbgalib/CMakeLists.txt
+++ b/Utilities/otbgalib/CMakeLists.txt
@@ -27,16 +27,20 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_LIBRARY(otbgalib ${GALIB_SRCS})
 TARGET_LINK_LIBRARIES (otbgalib)
-
-
-INSTALL(TARGETS otbgalib
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/ga/*.h")
-
-INSTALL(FILES ${__files} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib/ga
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbgalib PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
+
+IF(NOT OTB_INSTALL_NO_LIBRARIES)
+  INSTALL(TARGETS otbgalib
+    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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/ga/*.h")
+  INSTALL(FILES ${__files}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbgalib/ga
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbkml/CMakeLists.txt b/Utilities/otbkml/CMakeLists.txt
index e946668001..883885f440 100644
--- a/Utilities/otbkml/CMakeLists.txt
+++ b/Utilities/otbkml/CMakeLists.txt
@@ -238,92 +238,105 @@ IF( OTB_USE_EXTERNAL_EXPAT )
 ELSE( OTB_USE_EXTERNAL_EXPAT  )
         TARGET_LINK_LIBRARIES(otbkml otbexpat)
 ENDIF( OTB_USE_EXTERNAL_EXPAT )
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbkml PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-INSTALL(TARGETS otbkml
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
+  INSTALL(FILES ${__files1} ${__files2}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/BasicFilters
+    COMPONENT Development)
 
 FILE(GLOB __files0 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/*.h")
 INSTALL(FILES ${__files0} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml
     COMPONENT Development)
 
 FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/dom/*.h")
 INSTALL(FILES ${__files1} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml/dom
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml/dom
     COMPONENT Development)
 
 FILE(GLOB __files2 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/base/*.h")
 INSTALL(FILES ${__files2} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml/base
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml/base
     COMPONENT Development)
 
 FILE(GLOB __files3 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/convenience/*.h")
 INSTALL(FILES ${__files3} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml/convenience
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml/convenience
     COMPONENT Development)
 
 FILE(GLOB __files4 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/engine/*.h")
 INSTALL(FILES ${__files4} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml/engine
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml/engine
     COMPONENT Development)
 
 FILE(GLOB __files5 "${CMAKE_CURRENT_SOURCE_DIR}/src/kml/regionator/*.h")
 INSTALL(FILES ${__files5} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/kml/regionator
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/kml/regionator
     COMPONENT Development)
 
 FILE(GLOB __files6 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/uriparser-0.7.1/include/uriparser/*.h")
 INSTALL(FILES ${__files6} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/uriparser-0.7.1/include/uriparser
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/uriparser-0.7.1/include/uriparser
     COMPONENT Development)
 
 FILE(GLOB __files70 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/*.hpp")
 INSTALL(FILES ${__files70} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost
     COMPONENT Development)
 FILE(GLOB __files7 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/detail/*.hpp")
 INSTALL(FILES ${__files7} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/detail
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/detail
     COMPONENT Development)
 FILE(GLOB __files8 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/*.hpp")
 INSTALL(FILES ${__files8} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config
     COMPONENT Development)
 FILE(GLOB __files9 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/no_tr1/*.hpp")
 INSTALL(FILES ${__files9} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/no_tr1
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/no_tr1
     COMPONENT Development)
 FILE(GLOB __files10 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/stdlib/*.hpp")
 INSTALL(FILES ${__files10} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/stdlib
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/stdlib
     COMPONENT Development)
 
 FILE(GLOB __files11 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/platform/*.hpp")
 INSTALL(FILES ${__files11} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/platform
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/platform
     COMPONENT Development)
 
 FILE(GLOB __files12 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib-1.2.3/*.h")
 INSTALL(FILES ${__files12} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/zlib-1.2.3
     COMPONENT Development)
 FILE(GLOB __files13 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib-1.2.3/contrib/*.h")
 INSTALL(FILES ${__files13} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
     COMPONENT Development)
 FILE(GLOB __files14 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib-1.2.3/contrib/minizip/*.h")
 INSTALL(FILES ${__files14} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib/minizip
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/zlib-1.2.3/contrib/minizip
     COMPONENT Development)
 
 FILE(GLOB __files15 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/compiler/*.hpp")
 INSTALL(FILES ${__files15} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/compiler
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/compiler
     COMPONENT Development)
 FILE(GLOB __files16 "${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost_1_34_1/boost/config/abi/*.hpp")
 INSTALL(FILES ${__files16} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/abi
-    COMPONENT Development)
\ No newline at end of file
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbkml/third_party/boost_1_34_1/boost/config/abi
+    COMPONENT Development)
+
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbliblas/CMakeLists.txt b/Utilities/otbliblas/CMakeLists.txt
index c59d86a6c5..6d059c0194 100644
--- a/Utilities/otbliblas/CMakeLists.txt
+++ b/Utilities/otbliblas/CMakeLists.txt
@@ -32,14 +32,20 @@ SET(liblas_SOURCES
 #ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_LIBRARY(otbliblas ${liblas_SOURCES} )
-
-INSTALL(TARGETS otbliblas
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/include/liblas/*.hpp")
-INSTALL(FILES ${__files1} 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbliblas/include/liblas
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbliblas PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+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
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/CMakeLists.txt
index f4cd606c62..a0fb512f63 100644
--- a/Utilities/otbopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/CMakeLists.txt
@@ -141,7 +141,9 @@ IF(CYGWIN OR MINGW)
   ADD_DEFINITIONS(-DWIN32)
 ENDIF(CYGWIN OR MINGW)
 
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 # Install OTB specifics includes files
-INSTALL(FILES otb_openjpeg.h otb_openjpeg_mangle.h
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg
+  INSTALL(FILES otb_openjpeg.h otb_openjpeg_mangle.h
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenjpeg
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
index b7d19197c8..67b2b9d82c 100644
--- a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
@@ -52,14 +52,16 @@ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
-# Install library
-INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
+IF(NOT OTB_INSTALL_NO_LIBRARIES)
+  INSTALL(TARGETS ${OPENJPEG_LIBRARY_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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
 # Install includes files
-INSTALL(FILES openjpeg.h
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg 
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES openjpeg.h
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenjpeg/libopenjpeg 
     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 6dbff9fb4b..feea5a49d2 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/pthreads/CMakeLists.txt
@@ -42,25 +42,17 @@ LINK_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-# OTB Modifications
-#INSTALL(
-#	TARGETS OpenThreads
-#	ARCHIVE DESTINATION lib${LIB_POSTFIX}
-#	LIBRARY DESTINATION lib${LIB_POSTFIX}
-#	RUNTIME DESTINATION bin
-#)
-INSTALL(TARGETS OpenThreads
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-#INSTALL(
-#	FILES ${OpenThreads_PUBLIC_HEADERS}
-#	DESTINATION include/OpenThreads
-#)
-INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-	      DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include/OpenThreads
-	      COMPONENT Development)
-
+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)
+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
+              COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 #commented out# INCLUDE(ModuleInstall OPTIONAL)
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
index 5e79b5d31e..9d7dcce4b8 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/sproc/CMakeLists.txt
@@ -34,25 +34,18 @@ LINK_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-# OTB Modifications
-#INSTALL(
-#	TARGETS OpenThreads
-#	ARCHIVE DESTINATION lib${LIB_POSTFIX}
-#	LIBRARY DESTINATION lib${LIB_POSTFIX}
-#	RUNTIME DESTINATION bin
-#)
-INSTALL(TARGETS OpenThreads
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-
-#INSTALL(
-#	FILES ${OpenThreads_PUBLIC_HEADERS}
-#	DESTINATION include/OpenThreads
-#)
-INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-              DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include
+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)
+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
               COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
 
 #commented out# INCLUDE(ModuleInstall OPTIONAL)
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
index f023e63bd7..21e6372e78 100644
--- a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
+++ b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/CMakeLists.txt
@@ -33,26 +33,18 @@ LINK_DIRECTORIES(
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
-# OTB Modifications
-#INSTALL(
-#        TARGETS OpenThreads
-#        ARCHIVE DESTINATION lib
-#        LIBRARY DESTINATION lib
-#        RUNTIME DESTINATION bin
-#)
-INSTALL(TARGETS OpenThreads
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-
-#INSTALL(
-#       FILES ${OpenThreads_PUBLIC_HEADERS}
-#       DESTINATION include/OpenThreads
-#)
-INSTALL(FILES ${OpenThreads_PUBLIC_HEADERS}
-              DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenthreads/OpenThreads/include
+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)
+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
               COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
 
 #commented out# INCLUDE(ModuleInstall OPTIONAL)
diff --git a/Utilities/otbossim/include/CMakeLists.txt b/Utilities/otbossim/include/CMakeLists.txt
index d6ac5d54f2..1040e9391e 100644
--- a/Utilities/otbossim/include/CMakeLists.txt
+++ b/Utilities/otbossim/include/CMakeLists.txt
@@ -1,3 +1,7 @@
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
+
 FILE(GLOB ossim_base_HDRS "ossim/base/*.h")
 FILE(GLOB ossim_elevation_HDRS "ossim/elevation/*.h")
 FILE(GLOB ossim_font_HDRS "ossim/font/*.h")
@@ -13,48 +17,49 @@ FILE(GLOB ossim_vec_HDRS "ossim/vec/*.h")
 FILE(GLOB ossim_vpfutil_HDRS "ossim/vpfutil/*.h")
 
 INSTALL(FILES ${ossim_base_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/base
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/base
     COMPONENT Development)
 INSTALL(FILES ${ossim_elevation_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/elevation
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/elevation
     COMPONENT Development)
 INSTALL(FILES ${ossim_font_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/font
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/font
     COMPONENT Development)
 INSTALL(FILES ${ossim_imaging_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/imaging
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/imaging
     COMPONENT Development)
 INSTALL(FILES ${ossim_init_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/init
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/init
     COMPONENT Development)
 INSTALL(FILES ${ossim_kbool_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/kbool
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/kbool
     COMPONENT Development)
 INSTALL(FILES ${ossim_matrix_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/matrix
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/matrix
     COMPONENT Development)
 INSTALL(FILES ${ossim_parallel_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/parallel
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/parallel
     COMPONENT Development)
 INSTALL(FILES ${ossim_plugin_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/plugin
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/plugin
     COMPONENT Development)
 INSTALL(FILES ${ossim_projection_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/projection
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/projection
     COMPONENT Development)
 INSTALL(FILES ${ossim_support_data_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/support_data
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/support_data
     COMPONENT Development)
 INSTALL(FILES ${ossim_vec_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/vec
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/vec
     COMPONENT Development)
 INSTALL(FILES ${ossim_vpfutil_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim/vpfutil
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim/vpfutil
     COMPONENT Development)
 
 SET(ossim_config_HDR "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h" )
 
 INSTALL(FILES ${ossim_config_HDR}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossim/include/ossim
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbossim/include/ossim
     COMPONENT Development)
 
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbossim/src/ossim/CMakeLists.txt b/Utilities/otbossim/src/ossim/CMakeLists.txt
index 237aff4ed4..6add4b66cb 100644
--- a/Utilities/otbossim/src/ossim/CMakeLists.txt
+++ b/Utilities/otbossim/src/ossim/CMakeLists.txt
@@ -83,9 +83,14 @@ ${ossim_parallel_SRCS}
 ${ossim_elevation_SRCS}
 )
 TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} OpenThreads)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbossim PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS otbossim
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index b35afedd95..d508d75b43 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -16,14 +16,20 @@ ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
 IF( CYGWIN )
     TARGET_LINK_LIBRARIES(otbossimplugins otbossim ${GDAL_LIBRARY})
 ENDIF( CYGWIN )
-
-INSTALL(TARGETS otbossimplugins
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-FILE(GLOB __files1 "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-INSTALL(FILES ${__files1}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbossimplugins/
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbossimplugins PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
+
+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)
+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/otbossimplugins/
     COMPONENT Development)
-
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbsiftfast/CMakeLists.txt b/Utilities/otbsiftfast/CMakeLists.txt
index 994daa13c1..a9c2ba86aa 100755
--- a/Utilities/otbsiftfast/CMakeLists.txt
+++ b/Utilities/otbsiftfast/CMakeLists.txt
@@ -151,12 +151,19 @@ if( NOT DEFINED USE_OPENMP OR USE_OPENMP  )
 endif()
 
 #Instal TARGET & FILES for otb-lib
-
-INSTALL(TARGETS otbsiftfast
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-INSTALL(FILES siftfast.h 
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsiftfast
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbsiftfast PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
+
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES siftfast.h 
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbsiftfast
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbsvm/CMakeLists.txt b/Utilities/otbsvm/CMakeLists.txt
index 4a1b2d33cb..d517b80355 100644
--- a/Utilities/otbsvm/CMakeLists.txt
+++ b/Utilities/otbsvm/CMakeLists.txt
@@ -29,17 +29,21 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_LIBRARY(otbsvm ${OTBSVM_SRCS})
 TARGET_LINK_LIBRARIES (otbsvm ITKCommon)
-
-
-INSTALL(TARGETS otbsvm
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
-
-
-FILE(GLOB __files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-
-INSTALL(FILES ${__files}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbsvm 
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(otbsvm PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+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)
+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
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
 
diff --git a/Utilities/tinyXMLlib/CMakeLists.txt b/Utilities/tinyXMLlib/CMakeLists.txt
index ef5231d9f3..e1de4a684d 100644
--- a/Utilities/tinyXMLlib/CMakeLists.txt
+++ b/Utilities/tinyXMLlib/CMakeLists.txt
@@ -4,12 +4,19 @@ FILE(GLOB tinyXMLlib_SRCS "*.cpp")
 FILE(GLOB tinyXMLlib_HDRS "*.h")
 ADD_LIBRARY(tinyXML ${tinyXMLlib_SRCS})
 TARGET_LINK_LIBRARIES(tinyXML)
+IF(OTB_LIBRARY_PROPERTIES)
+  SET_TARGET_PROPERTIES(tinyXML PROPERTIES ${OTB_LIBRARY_PROPERTIES})
+ENDIF(OTB_LIBRARY_PROPERTIES)
 
-INSTALL(TARGETS tinyXML
-RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
+IF(NOT OTB_INSTALL_NO_LIBRARIES)
+  INSTALL(TARGETS tinyXML
+    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)
+ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
 
-INSTALL(FILES ${tinyXMLlib_HDRS}
-    DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/tinyXMLlib
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+  INSTALL(FILES ${tinyXMLlib_HDRS}
+    DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/tinyXMLlib
     COMPONENT Development)
+ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/otbGenerateOTBConfig.cmake b/otbGenerateOTBConfig.cmake
index 861b7a2e9a..82d2652c8f 100644
--- a/otbGenerateOTBConfig.cmake
+++ b/otbGenerateOTBConfig.cmake
@@ -46,16 +46,15 @@ CONFIGURE_FILE(${OTB_SOURCE_DIR}/OTBConfig.cmake.in
 #-----------------------------------------------------------------------------
 # Settings specific to the install tree.
 
-# The "use" file.
-SET(OTB_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/otb/UseOTB.cmake)
-
 # The library dependencies file.
-SET(OTB_LIBRARY_DEPENDS_FILE
-    ${CMAKE_INSTALL_PREFIX}/lib/otb/OTBLibraryDepends.cmake)
+SET(OTB_LIBRARY_DEPENDS_FILE "\${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/OTBLibraryDepends.cmake")
+
+# The "use" file.
+SET(OTB_USE_FILE \${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/UseOTB.cmake)
 
 # The build settings file.
-SET(OTB_BUILD_SETTINGS_FILE
-    ${CMAKE_INSTALL_PREFIX}/lib/otb/OTBBuildSettings.cmake)
+SET(OTB_BUILD_SETTINGS_FILE \${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/OTBBuildSettings.cmake)
+
 
 # Include directories.
 SET(OTB_INCLUDE_DIRS_CONFIG 
@@ -64,8 +63,7 @@ SET(OTB_INCLUDE_DIRS_CONFIG
 )
 
 # Link directories.
-SET(OTB_LIBRARY_DIRS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/otb)
-
+SET(OTB_LIBRARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}${OTB_INSTALL_LIB_DIR}")
 SET(OTB_LIBRARY_DIRS_CONFIG ${OTB_LIBRARY_DIRS_CONFIG} ${GDAL_LIBRARY_DIRS} ${ITK_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS})
 
 # Install Configure FLTK commands and directories
-- 
GitLab