BUG: cmake install directory correction: use ..._CM24 variables

Utilities/otbossim/include/CMakeLists.txt

@@ -12,49 +12,52 @@ FILE(GLOB ossim_support_data_HDRS "ossim/support_data/*.h")
 FILE(GLOB ossim_vec_HDRS "ossim/vec/*.h")
 FILE(GLOB ossim_vpfutil_HDRS "ossim/vpfutil/*.h")
 
+IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
+
 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)

Utilities/otbossim/src/ossim/CMakeLists.txt

@@ -107,8 +107,9 @@ ${ossim_elevation_SRCS}
 )
 TARGET_LINK_LIBRARIES(otbossim ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${JPEG_LIBRARY} OpenThreads)
 
-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)